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

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>

diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index 9c5a21fee83546f2a8f7a5da102bcaacab0726f3..193ff22f610b69833554cc1163a6cbd8801867f2 100644 (file)
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -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);
        }
 
-       if (pnv_pci_on_cxl_phb(dev) && adapter->slices >= 1)
-               pnv_cxl_phb_set_peer_afu(dev, adapter->afu[0]);
-
        return 0;
 }
 

diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c
index 7fd0bdc1436a3fd530bcd14c2d4e7f91f31f3cd4..1a99c9c7a6fbe4f14bf8bb7b9b5ac7a895f1ffae 100644 (file)
--- a/drivers/misc/cxl/vphb.c
+++ b/drivers/misc/cxl/vphb.c
@@ -9,7 +9,6 @@
 
 #include <linux/pci.h>
 #include <misc/cxl.h>
-#include <asm/pnv-pci.h>
 #include "cxl.h"
 
 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)
 {
        struct pci_controller *phb;
 
        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)
@@ -304,13 +298,7 @@ struct cxl_afu *cxl_pci_to_afu(struct pci_dev *dev)
 
        phb = pci_bus_to_host(dev->bus);
 
-       if (_cxl_pci_is_vphb_device(phb))
-               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);
+       return (struct cxl_afu *)phb->private_data;
 }
 EXPORT_SYMBOL_GPL(cxl_pci_to_afu);