PCI/ERR: Clear AER status only when we control AER (aa344bc8) · Commits · 戴 / test

In some cases a bridge may not exist as the hardware controlling may be handled only by firmware and so is not visible to the OS. This scenario is also possible in future use cases involving non-native use of RCECs by firmware. In this scenario, we expect the platform to retain control of the bridge and to clear error status itself. Clear error status only when the OS has native control of AER. Signed-off-by:

Sean V Kelley <sean.v.kelley@intel.com> Signed-off-by:

Bjorn Helgaas <bhelgaas@google.com>

drivers/pci/pcie/err.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -171,6 +171,7 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
		int type = pci_pcie_type(dev);
		struct pci_dev *bridge;
		pci_ers_result_t status = PCI_ERS_RESULT_CAN_RECOVER;
		struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);

		/*
		* Error recovery runs on all subordinates of the bridge. If the
		@@ -217,9 +218,17 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
		pci_dbg(bridge, "broadcast resume message\n");
		pci_walk_bridge(bridge, report_resume, &status);

		if (pcie_aer_is_native(bridge))
		/*
		* 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 (host->native_aer \|\| pcie_ports_native) {
		pcie_clear_device_status(bridge);
		pci_aer_clear_nonfatal_status(bridge);
		}
		pci_info(bridge, "device recovery successful\n");
		return status;

Admin message