Skip to content

Commit 6777877

Browse files
ktbowman-amddjbw
authored andcommitted
PCI/AER: Refactor cper_print_aer() for use by CXL driver module
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: Terry Bowman <terry.bowman@amd.com> Signed-off-by: Robert Richter <rrichter@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> Link: https://lore.kernel.org/r/20231018171713.1883517-13-rrichter@amd.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent f05fd10 commit 6777877

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

drivers/cxl/core/port.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2100,3 +2100,4 @@ static void cxl_core_exit(void)
21002100
subsys_initcall(cxl_core_init);
21012101
module_exit(cxl_core_exit);
21022102
MODULE_LICENSE("GPL v2");
2103+
MODULE_IMPORT_NS(CXL);

drivers/pci/pcie/aer.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -759,9 +759,10 @@ int cper_severity_to_aer(int cper_severity)
759759
}
760760
}
761761
EXPORT_SYMBOL_GPL(cper_severity_to_aer);
762+
#endif
762763

763-
void cper_print_aer(struct pci_dev *dev, int aer_severity,
764-
struct aer_capability_regs *aer)
764+
void pci_print_aer(struct pci_dev *dev, int aer_severity,
765+
struct aer_capability_regs *aer)
765766
{
766767
int layer, agent, tlp_header_valid = 0;
767768
u32 status, mask;
@@ -800,7 +801,7 @@ void cper_print_aer(struct pci_dev *dev, int aer_severity,
800801
trace_aer_event(dev_name(&dev->dev), (status & ~mask),
801802
aer_severity, tlp_header_valid, &aer->header_log);
802803
}
803-
#endif
804+
EXPORT_SYMBOL_NS_GPL(pci_print_aer, CXL);
804805

805806
/**
806807
* add_error_device - list device to be handled
@@ -996,7 +997,7 @@ static void aer_recover_work_func(struct work_struct *work)
996997
PCI_SLOT(entry.devfn), PCI_FUNC(entry.devfn));
997998
continue;
998999
}
999-
cper_print_aer(pdev, entry.severity, entry.regs);
1000+
pci_print_aer(pdev, entry.severity, entry.regs);
10001001
if (entry.severity == AER_NONFATAL)
10011002
pcie_do_recovery(pdev, pci_channel_io_normal,
10021003
aer_root_reset);

include/linux/aer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static inline int pci_aer_clear_nonfatal_status(struct pci_dev *dev)
5151
static inline int pcie_aer_is_native(struct pci_dev *dev) { return 0; }
5252
#endif
5353

54-
void cper_print_aer(struct pci_dev *dev, int aer_severity,
54+
void pci_print_aer(struct pci_dev *dev, int aer_severity,
5555
struct aer_capability_regs *aer);
5656
int cper_severity_to_aer(int cper_severity);
5757
void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,

0 commit comments

Comments
 (0)