Commit 7d7cbeab authored by Keith Busch's avatar Keith Busch Committed by Bjorn Helgaas
Browse files

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: default avatarHedi Berriche <hedi.berriche@hpe.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarSean V Kelley <sean.v.kelley@intel.com>
Acked-by: default avatarHedi Berriche <hedi.berriche@hpe.com>
parent 7c53f6b6

drivers/pci/pcie/err.c

+6 −7
Original line number Diff line number Diff line
@@ -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;