From: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Previously we enabled AER error reporting only for Switch Ports that were
enumerated prior to registering the AER service driver. Switch Ports
enumerated after AER driver registration were left with error reporting
disabled.
A common order, which works correctly, is that we enumerate devices before
registering portdrv and the AER driver:
- Enumerate all the devices at boot-time
- Register portdrv and bind it to all Root Ports and Switch Ports, which
disables error reporting for these Ports
- Register AER service driver and bind it to all Root Ports, which
enables error reporting for the Root Ports and any Switch Ports below
them
But if we enumerate devices *after* registering portdrv and the AER driver,
e.g., if a host bridge driver is loaded as a module, error reporting is not
enabled correctly:
- Register portdrv and AER driver (this happens at boot-time)
- Enumerate a Root Port
- Bind portdrv to Root Port, disabling its error reporting
- Bind AER service driver to Root Port, enabling error reporting for it
and its children (there are no children, since we haven't enumerated
them yet)
- Enumerate Switch Port below the Root Port
- Bind portdrv to Switch Port, disabling its error reporting
- AER service driver doesn't bind to Switch Ports, so error reporting
remains disabled
Hot-adding a Switch fails similarly: error reporting is enabled correctly
for the Root Port, but when the Switch is enumerated, the AER service
driver doesn't claim it, so there's nothing to enable error reporting for
the Switch Ports.
Change the AER service driver so it binds to *all* PCIe Ports, including
Switch Upstream and Downstream Ports. Enable AER error reporting for all
these Ports, but not for any children.
Binding the AER driver to all PCIe Ports requires additional changes
because aer_remove() and aer_root_reset() were previously called only for
Root Ports but may now be called for any Port.
- aer_remove() must check for Root Ports before disabling downstream
device error reporting and Root Port interrupts and status.
- aer_root_reset() must check for Root Ports before disabling and
restoring Root Port interrupts. This is called from reset_link(),
which previously fell back to default_reset_link() for Switch Ports
because they weren't claimed by the AER service driver. With the new
Root Port check, aer_root_reset() is equivalent to default_reset_link()
in that case.
Link: https://lore.kernel.org/linux-pci/1536085989-2956-1-git-send-email-jonathan.derrick@xxxxxxxxx
Based-on-patch-by: Jon Derrick <jonathan.derrick@xxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
---
drivers/pci/pcie/aer.c | 66 +++++++++++++++++++++++++++---------------------
1 file changed, 37 insertions(+), 29 deletions(-)
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index a90a9194ac4a..f4cafb2ee7da 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -1315,12 +1315,6 @@ static void aer_enable_rootport(struct aer_rpc *rpc)
pci_read_config_dword(pdev, aer_pos + PCI_ERR_UNCOR_STATUS, ®32);
pci_write_config_dword(pdev, aer_pos + PCI_ERR_UNCOR_STATUS, reg32);
- /*
- * Enable error reporting for the root port device and downstream port
- * devices.
- */
- set_downstream_devices_error_reporting(pdev, true);
-
/* Enable Root Port's interrupt in response to error messages */
pci_read_config_dword(pdev, aer_pos + PCI_ERR_ROOT_COMMAND, ®32);
reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;
@@ -1364,9 +1358,12 @@ static void aer_disable_rootport(struct aer_rpc *rpc)
*/
static void aer_remove(struct pcie_device *dev)
{
- struct aer_rpc *rpc = get_service_data(dev);
+ struct aer_rpc *rpc;
- aer_disable_rootport(rpc);
+ if (pci_pcie_type(dev->port) == PCI_EXP_TYPE_ROOT_PORT) {
+ rpc = get_service_data(dev);
+ aer_disable_rootport(rpc);
+ }
}
/**
@@ -1377,10 +1374,17 @@ static void aer_remove(struct pcie_device *dev)
*/
static int aer_probe(struct pcie_device *dev)
{
+ struct pci_dev *pdev = dev->port;
+ int type = pci_pcie_type(pdev);
int status;
struct aer_rpc *rpc;
struct device *device = &dev->device;
+ if (type == PCI_EXP_TYPE_UPSTREAM || type == PCI_EXP_TYPE_DOWNSTREAM) {
+ pci_enable_pcie_error_reporting(pdev);
+ return 0;
+ }
+
rpc = devm_kzalloc(device, sizeof(struct aer_rpc), GFP_KERNEL);
if (!rpc) {
dev_printk(KERN_DEBUG, device, "alloc AER rpc failed\n");
@@ -1398,52 +1402,56 @@ static int aer_probe(struct pcie_device *dev)
}
aer_enable_rootport(rpc);
+ pci_enable_pcie_error_reporting(pdev);
dev_info(device, "AER enabled with IRQ %d\n", dev->irq);
return 0;
}
/**
- * aer_root_reset - reset link on Root Port
- * @dev: pointer to Root Port's pci_dev data structure
+ * aer_reset_link - reset link
+ * @dev: pointer to pci_dev data structure
*
- * Invoked by Port Bus driver when performing link reset at Root Port.
+ * Invoked by Port Bus driver when performing link reset.
*/
-static pci_ers_result_t aer_root_reset(struct pci_dev *dev)
+static pci_ers_result_t aer_reset_link(struct pci_dev *dev)
{
u32 reg32;
- int pos;
+ int root = (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT);
+ int pos = dev->aer_cap;
int rc;
- pos = dev->aer_cap;
-
- /* Disable Root's interrupt in response to error messages */
- pci_read_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, ®32);
- reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;
- pci_write_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, reg32);
+ if (root) {
+ /* Disable Root's interrupt in response to error messages */
+ pci_read_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, ®32);
+ reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;
+ pci_write_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, reg32);
+ }
rc = pci_bus_error_reset(dev);
- pci_printk(KERN_DEBUG, dev, "Root Port link has been reset\n");
+ pci_printk(KERN_DEBUG, dev, "downstream link has been reset\n");
- /* Clear Root Error Status */
- pci_read_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, ®32);
- pci_write_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, reg32);
+ if (root) {
+ /* Clear Root Error Status */
+ pci_read_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, ®32);
+ pci_write_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, reg32);
- /* Enable Root Port's interrupt in response to error messages */
- pci_read_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, ®32);
- reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;
- pci_write_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, reg32);
+ /* Enable Root Port's interrupt in response to error messages */
+ pci_read_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, ®32);
+ reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;
+ pci_write_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, reg32);
+ }
return rc ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;
}
static struct pcie_port_service_driver aerdriver = {
.name = "aer",
- .port_type = PCI_EXP_TYPE_ROOT_PORT,
+ .port_type = PCIE_ANY_PORT,
.service = PCIE_PORT_SERVICE_AER,
.probe = aer_probe,
.remove = aer_remove,
- .reset_link = aer_root_reset,
+ .reset_link = aer_reset_link,
};
/**
