Message ID | 20200804194052.193272-7-sean.v.kelley@intel.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
Series | Add RCEC handling to PCI/AER | expand |
On Tue, 4 Aug 2020 12:40:49 -0700 Sean V Kelley <sean.v.kelley@intel.com> wrote: > From: Qiuxu Zhuo <qiuxu.zhuo@intel.com> > > When attempting error recovery for an RCiEP associated with an RCEC device, > there needs to be a way to update the Root Error Status, the Uncorrectable > Error Status and the Uncorrectable Error Severity of the parent RCEC. > So add the 'rcec' field to the pci_dev structure and provide a hook for the > Root Port Driver to associate RCiEPs with their respective parent RCEC. > > Co-developed-by: Sean V Kelley <sean.v.kelley@intel.com> > Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> > Signed-off-by: Sean V Kelley <sean.v.kelley@intel.com> Hi, One question in line. > --- > drivers/pci/pcie/aer.c | 9 +++++---- > drivers/pci/pcie/err.c | 12 ++++++++++++ > drivers/pci/pcie/portdrv_pci.c | 15 +++++++++++++++ > include/linux/pci.h | 3 +++ > 4 files changed, 35 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c > index 87283cda3990..f658607e8e00 100644 > --- a/drivers/pci/pcie/aer.c > +++ b/drivers/pci/pcie/aer.c > @@ -1358,17 +1358,18 @@ static int aer_probe(struct pcie_device *dev) > static pci_ers_result_t aer_root_reset(struct pci_dev *dev) > { > int aer = dev->aer_cap; > + int rc = 0; > u32 reg32; > - int rc; > - > > /* Disable Root's interrupt in response to error messages */ > pci_read_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, ®32); > reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK; > pci_write_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, reg32); > > - rc = pci_bus_error_reset(dev); > - pci_info(dev, "Root Port link has been reset\n"); > + if (pci_pcie_type(dev) != PCI_EXP_TYPE_RC_EC) { > + rc = pci_bus_error_reset(dev); > + pci_info(dev, "Root Port link has been reset\n"); > + } > > /* Clear Root Error Status */ > pci_read_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, ®32); > diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c > index 4812aa678eff..43f1c55c76db 100644 > --- a/drivers/pci/pcie/err.c > +++ b/drivers/pci/pcie/err.c > @@ -203,6 +203,12 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, > pci_walk_dev_affected(dev, report_frozen_detected, &status); > if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END) { > status = flr_on_rciep(dev); > + /* > + * The callback only clears the Root Error Status > + * of the RCEC (see aer.c). > + */ > + if (pcie_aer_is_native(dev) && dev->rcec) > + reset_link(dev->rcec); I'm not sure about this pcie_aer_is_native check. We don't check in the normal EP path. Perhaps we should be checking there as well? I can contrive a CPER record that hits the reset_link for the normal EP on my qemu test setup. Just for fun it causes a synchronous external abort that I need to track down but not related this patch or indeed reset_link and may just reflect an impossible to hit path in the e1000e driver. It needs a very contrived combination of blocks that say the error is fatal and others that say it isn't so I'm not that worried about that. > if (status != PCI_ERS_RESULT_RECOVERED) { > pci_warn(dev, "function level reset failed\n"); > goto failed; > @@ -247,7 +253,13 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, > if (pcie_aer_is_native(dev)) > pcie_clear_device_status(dev); > pci_aer_clear_nonfatal_status(dev); > + } else if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END) { > + if (pcie_aer_is_native(dev) && dev->rcec) > + pcie_clear_device_status(dev->rcec); > + if (dev->rcec) > + pci_aer_clear_nonfatal_status(dev->rcec); > } > + > pci_info(dev, "device recovery successful\n"); > return status; > > diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c > index 4d880679b9b1..dff5c9e13412 100644 > --- a/drivers/pci/pcie/portdrv_pci.c > +++ b/drivers/pci/pcie/portdrv_pci.c > @@ -90,6 +90,18 @@ static const struct dev_pm_ops pcie_portdrv_pm_ops = { > #define PCIE_PORTDRV_PM_OPS NULL > #endif /* !PM */ > > +static int pcie_hook_rcec(struct pci_dev *pdev, void *data) > +{ > + struct pci_dev *rcec = (struct pci_dev *)data; > + > + pdev->rcec = rcec; > + pci_dbg(rcec, "RCiEP(under an RCEC) %04x:%02x:%02x.%d\n", > + pci_domain_nr(pdev->bus), pdev->bus->number, > + PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); > + > + return 0; > +} > + > /* > * pcie_portdrv_probe - Probe PCI-Express port devices > * @dev: PCI-Express port device being probed > @@ -110,6 +122,9 @@ static int pcie_portdrv_probe(struct pci_dev *dev, > (pci_pcie_type(dev) != PCI_EXP_TYPE_RC_EC))) > return -ENODEV; > > + if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_EC) > + pcie_walk_rcec(dev, pcie_hook_rcec, dev); > + > status = pcie_port_device_register(dev); > if (status) > return status; > diff --git a/include/linux/pci.h b/include/linux/pci.h > index ee49469bd2b5..d5f7dbbf5e2f 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -326,6 +326,9 @@ struct pci_dev { > #ifdef CONFIG_PCIEAER > u16 aer_cap; /* AER capability offset */ > struct aer_stats *aer_stats; /* AER stats for this device */ > +#endif > +#ifdef CONFIG_PCIEPORTBUS > + struct pci_dev *rcec; /* Associated RCEC device */ > #endif > u8 pcie_cap; /* PCIe capability offset */ > u8 msi_cap; /* MSI capability offset */
On 5 Aug 2020, at 10:40, Jonathan Cameron wrote: > On Tue, 4 Aug 2020 12:40:49 -0700 > Sean V Kelley <sean.v.kelley@intel.com> wrote: > >> From: Qiuxu Zhuo <qiuxu.zhuo@intel.com> >> >> When attempting error recovery for an RCiEP associated with an RCEC >> device, >> there needs to be a way to update the Root Error Status, the >> Uncorrectable >> Error Status and the Uncorrectable Error Severity of the parent RCEC. >> So add the 'rcec' field to the pci_dev structure and provide a hook >> for the >> Root Port Driver to associate RCiEPs with their respective parent >> RCEC. >> >> Co-developed-by: Sean V Kelley <sean.v.kelley@intel.com> >> Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> >> Signed-off-by: Sean V Kelley <sean.v.kelley@intel.com> > Hi, > > One question in line. > >> --- >> drivers/pci/pcie/aer.c | 9 +++++---- >> drivers/pci/pcie/err.c | 12 ++++++++++++ >> drivers/pci/pcie/portdrv_pci.c | 15 +++++++++++++++ >> include/linux/pci.h | 3 +++ >> 4 files changed, 35 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c >> index 87283cda3990..f658607e8e00 100644 >> --- a/drivers/pci/pcie/aer.c >> +++ b/drivers/pci/pcie/aer.c >> @@ -1358,17 +1358,18 @@ static int aer_probe(struct pcie_device *dev) >> static pci_ers_result_t aer_root_reset(struct pci_dev *dev) >> { >> int aer = dev->aer_cap; >> + int rc = 0; >> u32 reg32; >> - int rc; >> - >> >> /* Disable Root's interrupt in response to error messages */ >> pci_read_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, ®32); >> reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK; >> pci_write_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, reg32); >> >> - rc = pci_bus_error_reset(dev); >> - pci_info(dev, "Root Port link has been reset\n"); >> + if (pci_pcie_type(dev) != PCI_EXP_TYPE_RC_EC) { >> + rc = pci_bus_error_reset(dev); >> + pci_info(dev, "Root Port link has been reset\n"); >> + } >> >> /* Clear Root Error Status */ >> pci_read_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, ®32); >> diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c >> index 4812aa678eff..43f1c55c76db 100644 >> --- a/drivers/pci/pcie/err.c >> +++ b/drivers/pci/pcie/err.c >> @@ -203,6 +203,12 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev >> *dev, >> pci_walk_dev_affected(dev, report_frozen_detected, &status); >> if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END) { >> status = flr_on_rciep(dev); >> + /* >> + * The callback only clears the Root Error Status >> + * of the RCEC (see aer.c). >> + */ >> + if (pcie_aer_is_native(dev) && dev->rcec) >> + reset_link(dev->rcec); > > I'm not sure about this pcie_aer_is_native check. > We don't check in the normal EP path. Perhaps we should be checking > there > as well? Looks like we should. Will make adjustments and test. > > I can contrive a CPER record that hits the reset_link for the normal > EP on my qemu > test setup. Just for fun it causes a synchronous external abort that > I need > to track down but not related this patch or indeed reset_link and may > just reflect > an impossible to hit path in the e1000e driver. > > It needs a very contrived combination of blocks that say the error is > fatal > and others that say it isn't so I'm not that worried about that. Okay, will also test on my end. Thanks, Sean > > >> if (status != PCI_ERS_RESULT_RECOVERED) { >> pci_warn(dev, "function level reset failed\n"); >> goto failed; >> @@ -247,7 +253,13 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev >> *dev, >> if (pcie_aer_is_native(dev)) >> pcie_clear_device_status(dev); >> pci_aer_clear_nonfatal_status(dev); >> + } else if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END) { >> + if (pcie_aer_is_native(dev) && dev->rcec) >> + pcie_clear_device_status(dev->rcec); >> + if (dev->rcec) >> + pci_aer_clear_nonfatal_status(dev->rcec); >> } >> + >> pci_info(dev, "device recovery successful\n"); >> return status; >> >> diff --git a/drivers/pci/pcie/portdrv_pci.c >> b/drivers/pci/pcie/portdrv_pci.c >> index 4d880679b9b1..dff5c9e13412 100644 >> --- a/drivers/pci/pcie/portdrv_pci.c >> +++ b/drivers/pci/pcie/portdrv_pci.c >> @@ -90,6 +90,18 @@ static const struct dev_pm_ops pcie_portdrv_pm_ops >> = { >> #define PCIE_PORTDRV_PM_OPS NULL >> #endif /* !PM */ >> >> +static int pcie_hook_rcec(struct pci_dev *pdev, void *data) >> +{ >> + struct pci_dev *rcec = (struct pci_dev *)data; >> + >> + pdev->rcec = rcec; >> + pci_dbg(rcec, "RCiEP(under an RCEC) %04x:%02x:%02x.%d\n", >> + pci_domain_nr(pdev->bus), pdev->bus->number, >> + PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); >> + >> + return 0; >> +} >> + >> /* >> * pcie_portdrv_probe - Probe PCI-Express port devices >> * @dev: PCI-Express port device being probed >> @@ -110,6 +122,9 @@ static int pcie_portdrv_probe(struct pci_dev >> *dev, >> (pci_pcie_type(dev) != PCI_EXP_TYPE_RC_EC))) >> return -ENODEV; >> >> + if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_EC) >> + pcie_walk_rcec(dev, pcie_hook_rcec, dev); >> + >> status = pcie_port_device_register(dev); >> if (status) >> return status; >> diff --git a/include/linux/pci.h b/include/linux/pci.h >> index ee49469bd2b5..d5f7dbbf5e2f 100644 >> --- a/include/linux/pci.h >> +++ b/include/linux/pci.h >> @@ -326,6 +326,9 @@ struct pci_dev { >> #ifdef CONFIG_PCIEAER >> u16 aer_cap; /* AER capability offset */ >> struct aer_stats *aer_stats; /* AER stats for this device */ >> +#endif >> +#ifdef CONFIG_PCIEPORTBUS >> + struct pci_dev *rcec; /* Associated RCEC device */ >> #endif >> u8 pcie_cap; /* PCIe capability offset */ >> u8 msi_cap; /* MSI capability offset */
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 87283cda3990..f658607e8e00 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -1358,17 +1358,18 @@ static int aer_probe(struct pcie_device *dev) static pci_ers_result_t aer_root_reset(struct pci_dev *dev) { int aer = dev->aer_cap; + int rc = 0; u32 reg32; - int rc; - /* Disable Root's interrupt in response to error messages */ pci_read_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, ®32); reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK; pci_write_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, reg32); - rc = pci_bus_error_reset(dev); - pci_info(dev, "Root Port link has been reset\n"); + if (pci_pcie_type(dev) != PCI_EXP_TYPE_RC_EC) { + rc = pci_bus_error_reset(dev); + pci_info(dev, "Root Port link has been reset\n"); + } /* Clear Root Error Status */ pci_read_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, ®32); diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c index 4812aa678eff..43f1c55c76db 100644 --- a/drivers/pci/pcie/err.c +++ b/drivers/pci/pcie/err.c @@ -203,6 +203,12 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, pci_walk_dev_affected(dev, report_frozen_detected, &status); if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END) { status = flr_on_rciep(dev); + /* + * The callback only clears the Root Error Status + * of the RCEC (see aer.c). + */ + if (pcie_aer_is_native(dev) && dev->rcec) + reset_link(dev->rcec); if (status != PCI_ERS_RESULT_RECOVERED) { pci_warn(dev, "function level reset failed\n"); goto failed; @@ -247,7 +253,13 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, if (pcie_aer_is_native(dev)) pcie_clear_device_status(dev); pci_aer_clear_nonfatal_status(dev); + } else if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END) { + if (pcie_aer_is_native(dev) && dev->rcec) + pcie_clear_device_status(dev->rcec); + if (dev->rcec) + pci_aer_clear_nonfatal_status(dev->rcec); } + pci_info(dev, "device recovery successful\n"); return status; diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index 4d880679b9b1..dff5c9e13412 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c @@ -90,6 +90,18 @@ static const struct dev_pm_ops pcie_portdrv_pm_ops = { #define PCIE_PORTDRV_PM_OPS NULL #endif /* !PM */ +static int pcie_hook_rcec(struct pci_dev *pdev, void *data) +{ + struct pci_dev *rcec = (struct pci_dev *)data; + + pdev->rcec = rcec; + pci_dbg(rcec, "RCiEP(under an RCEC) %04x:%02x:%02x.%d\n", + pci_domain_nr(pdev->bus), pdev->bus->number, + PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); + + return 0; +} + /* * pcie_portdrv_probe - Probe PCI-Express port devices * @dev: PCI-Express port device being probed @@ -110,6 +122,9 @@ static int pcie_portdrv_probe(struct pci_dev *dev, (pci_pcie_type(dev) != PCI_EXP_TYPE_RC_EC))) return -ENODEV; + if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_EC) + pcie_walk_rcec(dev, pcie_hook_rcec, dev); + status = pcie_port_device_register(dev); if (status) return status; diff --git a/include/linux/pci.h b/include/linux/pci.h index ee49469bd2b5..d5f7dbbf5e2f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -326,6 +326,9 @@ struct pci_dev { #ifdef CONFIG_PCIEAER u16 aer_cap; /* AER capability offset */ struct aer_stats *aer_stats; /* AER stats for this device */ +#endif +#ifdef CONFIG_PCIEPORTBUS + struct pci_dev *rcec; /* Associated RCEC device */ #endif u8 pcie_cap; /* PCIe capability offset */ u8 msi_cap; /* MSI capability offset */