github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 21:45:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
[ Upstream commit 8f1bbfbc35 ]

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: Sean V Kelley <sean.v.kelley@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sean V Kelley 2020-11-20 16:10:25 -08:00 committed by Greg Kroah-Hartman
parent 78d431e8a5
commit de4534ac28
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/pci.h
View File

@ -559,8 +559,8 @@ static inline int pci_dev_specific_disable_acs_redir(struct pci_dev *dev)
/* PCI error reporting and recovery */ /* PCI error reporting and recovery */
pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
pci_channel_state_t state, 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); bool pcie_wait_for_link(struct pci_dev *pdev, bool active);
#ifdef CONFIG_PCIEASPM #ifdef CONFIG_PCIEASPM

8
drivers/pci/pcie/err.c
View File

@ -147,8 +147,8 @@ static int report_resume(struct pci_dev *dev, void *data)
} }
pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
pci_channel_state_t state, 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; pci_ers_result_t status = PCI_ERS_RESULT_CAN_RECOVER;
struct pci_bus *bus; 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"); pci_dbg(dev, "broadcast error_detected message\n");
if (state == pci_channel_io_frozen) { if (state == pci_channel_io_frozen) {
pci_walk_bus(bus, report_frozen_detected, &status); pci_walk_bus(bus, report_frozen_detected, &status);
status = reset_link(dev); status = reset_subordinates(dev);
if (status != PCI_ERS_RESULT_RECOVERED) { if (status != PCI_ERS_RESULT_RECOVERED) {
pci_warn(dev, "link reset failed\n"); pci_warn(dev, "subordinate device reset failed\n");
goto failed; goto failed;
} }
} else { } else {