iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "cxl: Add support for using the kernel API with a real PHB"

Browse Source 
Remove abandonned capi support for the Mellanox CX4.

This reverts commit 317f5ef1b363417b6f1e93b90dfd2ffd6be6e867.

Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Alastair D'Silva 2018-06-28 12:05:05 +02:00 committed by Michael Ellerman
parent 29fea8aa21
commit c8d43cf08a
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/misc/cxl/pci.c
View File

@ -1886,9 +1886,6 @@ static int cxl_probe(struct pci_dev *dev, const struct pci_device_id *id)
dev_err(&dev->dev, "AFU %i failed to start: %i\n", slice, rc); dev_err(&dev->dev, "AFU %i failed to start: %i\n", slice, rc);
} }
if (pnv_pci_on_cxl_phb(dev) && adapter->slices >= 1)
pnv_cxl_phb_set_peer_afu(dev, adapter->afu[0]);
return 0; return 0;
} }

16
drivers/misc/cxl/vphb.c
View File

@ -9,7 +9,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <misc/cxl.h> #include <misc/cxl.h>
#include <asm/pnv-pci.h>
#include "cxl.h" #include "cxl.h"
static int cxl_dma_set_mask(struct pci_dev *pdev, u64 dma_mask) static int cxl_dma_set_mask(struct pci_dev *pdev, u64 dma_mask)
@ -284,18 +283,13 @@ void cxl_pci_vphb_remove(struct cxl_afu *afu)
*/ */
} }
static bool _cxl_pci_is_vphb_device(struct pci_controller *phb)
{
return (phb->ops == &cxl_pcie_pci_ops);
}
bool cxl_pci_is_vphb_device(struct pci_dev *dev) bool cxl_pci_is_vphb_device(struct pci_dev *dev)
{ {
struct pci_controller *phb; struct pci_controller *phb;
phb = pci_bus_to_host(dev->bus); phb = pci_bus_to_host(dev->bus);
return _cxl_pci_is_vphb_device(phb); return (phb->ops == &cxl_pcie_pci_ops);
} }
struct cxl_afu *cxl_pci_to_afu(struct pci_dev *dev) struct cxl_afu *cxl_pci_to_afu(struct pci_dev *dev)
@ -304,13 +298,7 @@ struct cxl_afu *cxl_pci_to_afu(struct pci_dev *dev)
phb = pci_bus_to_host(dev->bus); phb = pci_bus_to_host(dev->bus);
if (_cxl_pci_is_vphb_device(phb)) return (struct cxl_afu *)phb->private_data;
return (struct cxl_afu *)phb->private_data;
if (pnv_pci_on_cxl_phb(dev))
return pnv_cxl_phb_to_afu(phb);
return ERR_PTR(-ENODEV);
} }
EXPORT_SYMBOL_GPL(cxl_pci_to_afu); EXPORT_SYMBOL_GPL(cxl_pci_to_afu);