Messages in this thread Patch in this message |  | | Subject | Re: [PATCH v18 05/11] PCI/ERR: Remove service dependency in pcie_do_recovery() | From | "Kuppuswamy, Sathyanarayanan" <> | Date | Sat, 28 Mar 2020 14:12:48 -0700 |
| |
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 >
|  |