| Message ID | 1467638532-9250-8-git-send-email-imunsie@au.ibm.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
Le 04/07/2016 15:22, Ian Munsie a écrit : > From: Ian Munsie <imunsie@au1.ibm.com> > > This hooks up support for using the kernel API with a real PHB. After > the AFU initialisation has completed it calls into the PHB code to pass > it the AFU that will be used by other peer physical functions on the > adapter. > > The cxl_pci_to_afu API is extended to work with peer PCI devices, > retrieving the peer AFU from the PHB. This API may also now return an > error if it is called on a PCI device that is not associated with either > a cxl vPHB or a peer PCI device to an AFU, and this error is propagated > down. > > Signed-off-by: Ian Munsie <imunsie@au1.ibm.com> Reviewed-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
> @@ -1572,6 +1575,9 @@ static pci_ers_result_t cxl_pci_error_detected(struct pci_dev *pdev, > */ > for (i = 0; i < adapter->slices; i++) { > afu = adapter->afu[i]; > + /* Only participate in EEH if we are on a virtual PHB */ > + if (afu->phb == NULL) > + return PCI_ERS_RESULT_NONE; > cxl_vphb_error_detected(afu, state); > } Sorry, I had my notes out of order, something is bugging me here. Don't we always define afu->phb, though for Mellanox (or if there's no config record in the general case), we don't have any devices attached to it? Which raises the question of the handling of slot_reset and resume callbacks... Fred
Excerpts from Frederic Barrat's message of 2016-07-06 20:30:41 +0200: > > > @@ -1572,6 +1575,9 @@ static pci_ers_result_t cxl_pci_error_detected(struct pci_dev *pdev, > > */ > > for (i = 0; i < adapter->slices; i++) { > > afu = adapter->afu[i]; > > + /* Only participate in EEH if we are on a virtual PHB */ > > + if (afu->phb == NULL) > > + return PCI_ERS_RESULT_NONE; > > cxl_vphb_error_detected(afu, state); > > } > > > Sorry, I had my notes out of order, something is bugging me here. Don't > we always define afu->phb, though for Mellanox (or if there's no config > record in the general case), we don't have any devices attached to it? I think you're right. I'll change the vPHB code to skip it if there are no configuration records. > Which raises the question of the handling of slot_reset and resume > callbacks... We aren't going to support EEH (at least not yet) - the vPHB model makes this (relatively) easy since we can notify the AFU drivers when we get notified, but in the peer model it will be the real PHB notifying us and the networking drivers. If we do end up supporting that, it will come later. Cheers, -Ian
diff --git a/drivers/misc/cxl/api.c b/drivers/misc/cxl/api.c index 7707055..6a030bf 100644 --- a/drivers/misc/cxl/api.c +++ b/drivers/misc/cxl/api.c @@ -13,6 +13,7 @@ #include <linux/file.h> #include <misc/cxl.h> #include <linux/fs.h> +#include <asm/pnv-pci.h> #include "cxl.h" @@ -24,6 +25,8 @@ struct cxl_context *cxl_dev_context_init(struct pci_dev *dev) int rc; afu = cxl_pci_to_afu(dev); + if (IS_ERR(afu)) + return ERR_CAST(afu); ctx = cxl_context_alloc(); if (IS_ERR(ctx)) { @@ -438,6 +441,8 @@ EXPORT_SYMBOL_GPL(cxl_perst_reloads_same_image); ssize_t cxl_read_adapter_vpd(struct pci_dev *dev, void *buf, size_t count) { struct cxl_afu *afu = cxl_pci_to_afu(dev); + if (IS_ERR(afu)) + return -ENODEV; return cxl_ops->read_adapter_vpd(afu->adapter, buf, count); } diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index 6c0597d..02242be 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c @@ -1502,6 +1502,9 @@ 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; } @@ -1572,6 +1575,9 @@ static pci_ers_result_t cxl_pci_error_detected(struct pci_dev *pdev, */ for (i = 0; i < adapter->slices; i++) { afu = adapter->afu[i]; + /* Only participate in EEH if we are on a virtual PHB */ + if (afu->phb == NULL) + return PCI_ERS_RESULT_NONE; cxl_vphb_error_detected(afu, state); } return PCI_ERS_RESULT_DISCONNECT; diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c index c5b9c201..08e8db7 100644 --- a/drivers/misc/cxl/vphb.c +++ b/drivers/misc/cxl/vphb.c @@ -9,6 +9,7 @@ #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) @@ -280,13 +281,18 @@ void cxl_pci_vphb_remove(struct cxl_afu *afu) pcibios_free_controller(phb); } +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 (phb->ops == &cxl_pcie_pci_ops); + return _cxl_pci_is_vphb_device(phb); } struct cxl_afu *cxl_pci_to_afu(struct pci_dev *dev) @@ -295,7 +301,13 @@ struct cxl_afu *cxl_pci_to_afu(struct pci_dev *dev) phb = pci_bus_to_host(dev->bus); - return (struct cxl_afu *)phb->private_data; + 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); } EXPORT_SYMBOL_GPL(cxl_pci_to_afu);