| Message ID | 20230622205523.85375-21-terry.bowman@amd.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | cxl/pci: Add support for RCH RAS error handling | expand |
On 6/22/23 13:55, Terry Bowman wrote: > The CXL driver plans to use cper_print_aer() for logging restricted CXL > host (RCH) AER errors. cper_print_aer() is not currently exported and > therefore not usable by the CXL drivers built as loadable modules. Export > the cper_print_aer() function. Use the EXPORT_SYMBOL_NS_GPL() variant > to restrict the export to CXL drivers. > > The CONFIG_ACPI_APEI_PCIEAER kernel config is currently used to enable > cper_print_aer(). cper_print_aer() logs the AER registers and is > useful in PCIE AER logging outside of APEI. Remove the > CONFIG_ACPI_APEI_PCIEAER dependency to enable cper_print_aer(). > > The cper_print_aer() function name implies CPER specific use but is useful > in non-CPER cases as well. Rename cper_print_aer() to pci_print_aer(). > > Also, update cxl_core to import CXL namespace imports. > > Co-developed-by: Robert Richter <rrichter@amd.com> > Signed-off-by: Robert Richter <rrichter@amd.com> > Signed-off-by: Terry Bowman <terry.bowman@amd.com> > Cc: Mahesh J Salgaonkar <mahesh@linux.ibm.com> > Cc: "Oliver O'Halloran" <oohall@gmail.com> > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: linux-pci@vger.kernel.org > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Acked-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> > --- > drivers/cxl/core/port.c | 1 + > drivers/pci/pcie/aer.c | 9 +++++---- > include/linux/aer.h | 2 +- > 3 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c > index 449472fb26a8..683f40e98119 100644 > --- a/drivers/cxl/core/port.c > +++ b/drivers/cxl/core/port.c > @@ -2058,3 +2058,4 @@ static void cxl_core_exit(void) > subsys_initcall(cxl_core_init); > module_exit(cxl_core_exit); > MODULE_LICENSE("GPL v2"); > +MODULE_IMPORT_NS(CXL); > diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c > index f6c24ded134c..d3344fcf1f79 100644 > --- a/drivers/pci/pcie/aer.c > +++ b/drivers/pci/pcie/aer.c > @@ -771,9 +771,10 @@ int cper_severity_to_aer(int cper_severity) > } > } > EXPORT_SYMBOL_GPL(cper_severity_to_aer); > +#endif > > -void cper_print_aer(struct pci_dev *dev, int aer_severity, > - struct aer_capability_regs *aer) > +void pci_print_aer(struct pci_dev *dev, int aer_severity, > + struct aer_capability_regs *aer) > { > int layer, agent, tlp_header_valid = 0; > u32 status, mask; > @@ -812,7 +813,7 @@ void cper_print_aer(struct pci_dev *dev, int aer_severity, > trace_aer_event(dev_name(&dev->dev), (status & ~mask), > aer_severity, tlp_header_valid, &aer->header_log); > } > -#endif > +EXPORT_SYMBOL_NS_GPL(pci_print_aer, CXL); > > /** > * add_error_device - list device to be handled > @@ -1009,7 +1010,7 @@ static void aer_recover_work_func(struct work_struct *work) > PCI_SLOT(entry.devfn), PCI_FUNC(entry.devfn)); > continue; > } > - cper_print_aer(pdev, entry.severity, entry.regs); > + pci_print_aer(pdev, entry.severity, entry.regs); > if (entry.severity == AER_NONFATAL) > pcie_do_recovery(pdev, pci_channel_io_normal, > aer_root_reset); > diff --git a/include/linux/aer.h b/include/linux/aer.h > index 97f64ba1b34a..8f124b904314 100644 > --- a/include/linux/aer.h > +++ b/include/linux/aer.h > @@ -64,7 +64,7 @@ static inline void pci_save_aer_state(struct pci_dev *dev) {} > static inline void pci_restore_aer_state(struct pci_dev *dev) {} > #endif > > -void cper_print_aer(struct pci_dev *dev, int aer_severity, > +void pci_print_aer(struct pci_dev *dev, int aer_severity, > struct aer_capability_regs *aer); > int cper_severity_to_aer(int cper_severity); > void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 449472fb26a8..683f40e98119 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -2058,3 +2058,4 @@ static void cxl_core_exit(void) subsys_initcall(cxl_core_init); module_exit(cxl_core_exit); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(CXL); diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index f6c24ded134c..d3344fcf1f79 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -771,9 +771,10 @@ int cper_severity_to_aer(int cper_severity) } } EXPORT_SYMBOL_GPL(cper_severity_to_aer); +#endif -void cper_print_aer(struct pci_dev *dev, int aer_severity, - struct aer_capability_regs *aer) +void pci_print_aer(struct pci_dev *dev, int aer_severity, + struct aer_capability_regs *aer) { int layer, agent, tlp_header_valid = 0; u32 status, mask; @@ -812,7 +813,7 @@ void cper_print_aer(struct pci_dev *dev, int aer_severity, trace_aer_event(dev_name(&dev->dev), (status & ~mask), aer_severity, tlp_header_valid, &aer->header_log); } -#endif +EXPORT_SYMBOL_NS_GPL(pci_print_aer, CXL); /** * add_error_device - list device to be handled @@ -1009,7 +1010,7 @@ static void aer_recover_work_func(struct work_struct *work) PCI_SLOT(entry.devfn), PCI_FUNC(entry.devfn)); continue; } - cper_print_aer(pdev, entry.severity, entry.regs); + pci_print_aer(pdev, entry.severity, entry.regs); if (entry.severity == AER_NONFATAL) pcie_do_recovery(pdev, pci_channel_io_normal, aer_root_reset); diff --git a/include/linux/aer.h b/include/linux/aer.h index 97f64ba1b34a..8f124b904314 100644 --- a/include/linux/aer.h +++ b/include/linux/aer.h @@ -64,7 +64,7 @@ static inline void pci_save_aer_state(struct pci_dev *dev) {} static inline void pci_restore_aer_state(struct pci_dev *dev) {} #endif -void cper_print_aer(struct pci_dev *dev, int aer_severity, +void pci_print_aer(struct pci_dev *dev, int aer_severity, struct aer_capability_regs *aer); int cper_severity_to_aer(int cper_severity); void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,