summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Busch <kbusch@kernel.org>2021-01-04 15:02:56 -0800
committerBjorn Helgaas <bhelgaas@google.com>2021-02-23 17:10:10 -0600
commit7d7cbeaba5b7aea8e1e4eb988d6b5e7cb3c34490 (patch)
tree26db03b1f6f81fb6cf845dbe6018053e1ad8e5fb
parent7c53f6b671f4aba70ff15e1b05148b10d58c2837 (diff)
downloadlinux-stable-7d7cbeaba5b7aea8e1e4eb988d6b5e7cb3c34490.tar.gz
linux-stable-7d7cbeaba5b7aea8e1e4eb988d6b5e7cb3c34490.tar.bz2
linux-stable-7d7cbeaba5b7aea8e1e4eb988d6b5e7cb3c34490.zip
PCI/ERR: Clear status of the reporting device
Error handling operates on the first Downstream Port above the detected error, but the error may have been reported by a downstream device. Clear the AER status of the device that reported the error rather than the first Downstream Port. Link: https://lore.kernel.org/r/20210104230300.1277180-2-kbusch@kernel.org Tested-by: Hedi Berriche <hedi.berriche@hpe.com> Signed-off-by: Keith Busch <kbusch@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Sean V Kelley <sean.v.kelley@intel.com> Acked-by: Hedi Berriche <hedi.berriche@hpe.com>
-rw-r--r--drivers/pci/pcie/err.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
index 510f31f0ef6d..a84f0bf4c1e2 100644
--- a/drivers/pci/pcie/err.c
+++ b/drivers/pci/pcie/err.c
@@ -231,15 +231,14 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
pci_walk_bridge(bridge, report_resume, &status);
/*
- * If we have native control of AER, clear error status in the Root
- * Port or Downstream Port that signaled the error. If the
- * platform retained control of AER, it is responsible for clearing
- * this status. In that case, the signaling device may not even be
- * visible to the OS.
+ * If we have native control of AER, clear error status in the device
+ * that detected the error. If the platform retained control of AER,
+ * it is responsible for clearing this status. In that case, the
+ * signaling device may not even be visible to the OS.
*/
if (host->native_aer || pcie_ports_native) {
- pcie_clear_device_status(bridge);
- pci_aer_clear_nonfatal_status(bridge);
+ pcie_clear_device_status(dev);
+ pci_aer_clear_nonfatal_status(dev);
}
pci_info(bridge, "device recovery successful\n");
return status;