Commit 8f1bbfbc authored by Sean V Kelley's avatar Sean V Kelley Committed by Bjorn Helgaas
Browse files

PCI/ERR: Rename reset_link() to reset_subordinates() 

reset_link() appears to be misnamed.  The point is to reset any devices
below a given bridge, so rename it to reset_subordinates() to make it clear
that we are passing a bridge with the intent to reset the devices below it.

Link: https://lore.kernel.org/r/20201121001036.8560-5-sean.v.kelley@intel.com


Tested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> # non-native/no RCEC
Signed-off-by: default avatarSean V Kelley <sean.v.kelley@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 90655631

drivers/pci/pci.h

+2 −2
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ static inline int pci_dev_specific_disable_acs_redir(struct pci_dev *dev) 
/* PCI error reporting and recovery */

pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,

		pci_channel_state_t state,

			pci_ers_result_t (*reset_link)(struct pci_dev *pdev));

		pci_ers_result_t (*reset_subordinates)(struct pci_dev *pdev));



bool pcie_wait_for_link(struct pci_dev *pdev, bool active);

#ifdef CONFIG_PCIEASPM

drivers/pci/pcie/err.c

+4 −4
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ out: 


pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,

		pci_channel_state_t state,

			pci_ers_result_t (*reset_link)(struct pci_dev *pdev))

		pci_ers_result_t (*reset_subordinates)(struct pci_dev *pdev))

{

	pci_ers_result_t status = PCI_ERS_RESULT_CAN_RECOVER;

	struct pci_bus *bus;
@@ -165,9 +165,9 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, 
	pci_dbg(dev, "broadcast error_detected message\n");

	if (state == pci_channel_io_frozen) {

		pci_walk_bus(bus, report_frozen_detected, &status);

		status = reset_link(dev);

		status = reset_subordinates(dev);

		if (status != PCI_ERS_RESULT_RECOVERED) {

			pci_warn(dev, "link reset failed\n");

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

			goto failed;

		}

	} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE