lkml.org 
[lkml]   [2020]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v7 04/13] PCI/ERR: Rename reset_link() to reset_subordinate_device()
On Wed, 30 Sep 2020 14:58:11 -0700
Sean V Kelley <seanvk.dev@oregontracks.org> wrote:

> From: Sean V Kelley <sean.v.kelley@intel.com>
>
> reset_link() appears to be misnamed. The point is to really
> reset any devices below a given bridge. So rename it to
> reset_subordinate_devices() to make it clear that we are
> passing a bridge with the intent to reset the devices below it.
>
> Suggested-by: Bjorn Helgaas <helgaas@google.com>
> Signed-off-by: Sean V Kelley <sean.v.kelley@intel.com>

Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

> ---
> drivers/pci/pci.h | 2 +-
> drivers/pci/pcie/err.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
> index 88e27a98def5..efea170805fa 100644
> --- a/drivers/pci/pci.h
> +++ b/drivers/pci/pci.h
> @@ -574,7 +574,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_subordinate_devices)(struct pci_dev *pdev));
>
> bool pcie_wait_for_link(struct pci_dev *pdev, bool active);
> #ifdef CONFIG_PCIEASPM
> diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
> index c543f419d8f9..950612342f1c 100644
> --- a/drivers/pci/pcie/err.c
> +++ b/drivers/pci/pcie/err.c
> @@ -148,7 +148,7 @@ static int report_resume(struct pci_dev *dev, void *data)
>
> 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_subordinate_devices)(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_subordinate_device(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 {


\
 
 \ /
  Last update: 2020-10-01 11:05    [W:0.119 / U:21.552 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site