Commit c3900329 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/error' 

- Clear AER status of the reporting device (Keith Busch)

- Clear AER status from Root Port when resetting Downstream Port (Keith
  Busch)

- Retain status from error notification (Keith Busch)

- Log the type of Port that was reset for error handling (Keith Busch)

- Report reset for frozen channel (Keith Busch)

* pci/error:
  PCI/portdrv: Report reset for frozen channel
  PCI/AER: Specify the type of Port that was reset
  PCI/ERR: Retain status from error notification
  PCI/AER: Clear AER status from Root Port when resetting Downstream Port
  PCI/ERR: Clear status of the reporting device
parents ce3e292e ba952824

drivers/pci/pcie/aer.c

+3 −2
Original line number Diff line number Diff line
@@ -1388,7 +1388,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) 
	if (type == PCI_EXP_TYPE_RC_END)

		root = dev->rcec;

	else

		root = dev;

		root = pcie_find_root_port(dev);



	/*

	 * If the platform retained control of AER, an RCiEP may not have
@@ -1414,7 +1414,8 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) 
		}

	} else {

		rc = pci_bus_error_reset(dev);

		pci_info(dev, "Root Port link has been reset (%d)\n", rc);

		pci_info(dev, "%s Port link has been reset (%d)\n",

			pci_is_root_bus(dev->bus) ? "Root" : "Downstream", rc);

	}



	if ((host->native_aer || pcie_ports_native) && aer) {

drivers/pci/pcie/err.c

+7 −9
Original line number Diff line number Diff line
@@ -198,8 +198,7 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, 
	pci_dbg(bridge, "broadcast error_detected message\n");

	if (state == pci_channel_io_frozen) {

		pci_walk_bridge(bridge, report_frozen_detected, &status);

		status = reset_subordinates(bridge);

		if (status != PCI_ERS_RESULT_RECOVERED) {

		if (reset_subordinates(bridge) != PCI_ERS_RESULT_RECOVERED) {

			pci_warn(bridge, "subordinate device reset failed\n");

			goto failed;

		}
@@ -231,15 +230,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;

drivers/pci/pcie/portdrv_pci.c

+2 −1
Original line number Diff line number Diff line
@@ -153,7 +153,8 @@ static void pcie_portdrv_remove(struct pci_dev *dev) 
static pci_ers_result_t pcie_portdrv_error_detected(struct pci_dev *dev,

					pci_channel_state_t error)

{

	/* Root Port has no impact. Always recovers. */

	if (error == pci_channel_io_frozen)

		return PCI_ERS_RESULT_NEED_RESET;

	return PCI_ERS_RESULT_CAN_RECOVER;

}