From: "Kuppuswamy, Sathyanarayanan" <sathyanarayanan.kuppuswamy@linux.intel.com> To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, ashok.raj@intel.com Subject: Re: [PATCH v18 05/11] PCI/ERR: Remove service dependency in pcie_do_recovery() Date: Sat, 28 Mar 2020 14:12:48 -0700 Message-ID: <bcc1910b-90fe-25b5-3cee-8f9d7e83e45e@linux.intel.com> (raw) In-Reply-To: <60e02b87b526cdf2930400059d98704bf0a147d1.1585000084.git.sathyanarayanan.kuppuswamy@linux.intel.com> Hi Bjorn, On 3/23/20 5:26 PM, sathyanarayanan.kuppuswamy@linux.intel.com wrote: > From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> > > +void pcie_do_recovery(struct pci_dev *dev, > + enum pci_channel_state state, > + pci_ers_result_t (*reset_link)(struct pci_dev *pdev)) > { > pci_ers_result_t status = PCI_ERS_RESULT_CAN_RECOVER; > struct pci_bus *bus; > @@ -206,9 +165,12 @@ void pcie_do_recovery(struct pci_dev *dev, enum pci_channel_state state, > 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, service); > - if if (reset_link) status = reset_link(dev);(status == PCI_ERS_RESULT_DISCONNECT > + status = reset_link(dev); Above line needs to be replaced as below. Since there is a possibility reset_link can NULL (eventhough currently its not true). if (reset_link) status = reset_link(dev); Shall I submit another version to add above fix on top of our pci/edr branch ? > + if ((status != PCI_ERS_RESULT_RECOVERED) && > + (status != PCI_ERS_RESULT_NEED_RESET)) { > + pci_dbg(dev, "link reset at upstream device failed\n"); > goto failed; > + } > } else { > pci_walk_bus(bus, report_normal_detected, &status); > } > diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h > index 1e673619b101..64b5e081cdb2 100644 > --- a/drivers/pci/pcie/portdrv.h > +++ b/drivers/pci/pcie/portdrv.h > @@ -92,9 +92,6 @@ struct pcie_port_service_driver { > /* Device driver may resume normal operations */ > void (*error_resume)(struct pci_dev *dev); > > - /* Link Reset Capability - AER service driver specific */ > - pci_ers_result_t (*reset_link)(struct pci_dev *dev); > - > int port_type; /* Type of the port this driver can handle */ > u32 service; /* Port service this device represents */ > > @@ -161,7 +158,5 @@ static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev) > } > #endif > > -struct pcie_port_service_driver *pcie_port_find_service(struct pci_dev *dev, > - u32 service); > struct device *pcie_port_find_device(struct pci_dev *dev, u32 service); > #endif /* _PORTDRV_H_ */ > diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c > index 5075cb9e850c..50a9522ab07d 100644 > --- a/drivers/pci/pcie/portdrv_core.c > +++ b/drivers/pci/pcie/portdrv_core.c > @@ -458,27 +458,6 @@ static int find_service_iter(struct device *device, void *data) > return 0; > } > > -/** > - * pcie_port_find_service - find the service driver > - * @dev: PCI Express port the service is associated with > - * @service: Service to find > - * > - * Find PCI Express port service driver associated with given service > - */ > -struct pcie_port_service_driver *pcie_port_find_service(struct pci_dev *dev, > - u32 service) > -{ > - struct pcie_port_service_driver *drv; > - struct portdrv_service_data pdrvs; > - > - pdrvs.drv = NULL; > - pdrvs.service = service; > - device_for_each_child(&dev->dev, &pdrvs, find_service_iter); > - > - drv = pdrvs.drv; > - return drv; > -} > - > /** > * pcie_port_find_device - find the struct device > * @dev: PCI Express port the service is associated with >
next prev parent reply index Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-24 0:25 [PATCH v18 00/11] Add Error Disconnect Recover (EDR) support sathyanarayanan.kuppuswamy 2020-03-24 0:25 ` [PATCH v18 01/11] PCI/ERR: Update error status after reset_link() sathyanarayanan.kuppuswamy 2020-03-24 0:25 ` [PATCH v18 02/11] PCI: move {pciehp,shpchp}_is_native() definitions to pci.c sathyanarayanan.kuppuswamy 2020-03-24 0:26 ` [PATCH v18 03/11] PCI/DPC: Fix DPC recovery issue in non hotplug case sathyanarayanan.kuppuswamy 2020-03-24 23:49 ` Bjorn Helgaas 2020-03-25 1:17 ` Kuppuswamy, Sathyanarayanan 2020-03-28 17:10 ` Bjorn Helgaas 2020-03-28 22:04 ` Kuppuswamy, Sathyanarayanan 2020-03-28 22:21 ` Bjorn Helgaas 2020-03-28 22:40 ` Kuppuswamy, Sathyanarayanan 2020-03-24 0:26 ` [PATCH v18 04/11] PCI/DPC: Move DPC data into struct pci_dev sathyanarayanan.kuppuswamy 2020-03-24 0:26 ` [PATCH v18 05/11] PCI/ERR: Remove service dependency in pcie_do_recovery() sathyanarayanan.kuppuswamy 2020-03-28 21:12 ` Kuppuswamy, Sathyanarayanan [this message] 2020-03-28 21:32 ` Bjorn Helgaas 2020-03-28 21:55 ` Kuppuswamy, Sathyanarayanan 2020-03-28 22:16 ` Bjorn Helgaas 2020-03-24 0:26 ` [PATCH v18 06/11] PCI/ERR: Return status of pcie_do_recovery() sathyanarayanan.kuppuswamy 2020-03-24 0:26 ` [PATCH v18 07/11] PCI/DPC: Cache DPC capabilities in pci_init_capabilities() sathyanarayanan.kuppuswamy 2020-03-24 0:26 ` [PATCH v18 08/11] PCI/AER: Add pci_aer_raw_clear_status() to unconditionally clear Error Status sathyanarayanan.kuppuswamy 2020-03-24 0:26 ` [PATCH v18 09/11] PCI/DPC: Expose dpc_process_error(), dpc_reset_link() for use by EDR sathyanarayanan.kuppuswamy 2020-03-24 0:26 ` [PATCH v18 10/11] PCI/DPC: Add Error Disconnect Recover (EDR) support sathyanarayanan.kuppuswamy 2020-03-24 21:37 ` Bjorn Helgaas 2020-03-25 1:00 ` Kuppuswamy, Sathyanarayanan 2020-03-26 22:36 ` Bjorn Helgaas 2020-03-24 0:26 ` [PATCH v18 11/11] PCI/AER: Rationalize error status register clearing sathyanarayanan.kuppuswamy 2020-03-31 15:28 ` [PATCH v18 00/11] Add Error Disconnect Recover (EDR) support Bjorn Helgaas 2020-03-31 16:28 ` Kuppuswamy, Sathyanarayanan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=bcc1910b-90fe-25b5-3cee-8f9d7e83e45e@linux.intel.com \ --to=sathyanarayanan.kuppuswamy@linux.intel.com \ --cc=ashok.raj@intel.com \ --cc=bhelgaas@google.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-PCI Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-pci/0 linux-pci/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-pci linux-pci/ https://lore.kernel.org/linux-pci \ linux-pci@vger.kernel.org public-inbox-index linux-pci Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-pci AGPL code for this site: git clone https://public-inbox.org/public-inbox.git