63a2b0df73
JIRA: https://issues.redhat.com/browse/RHEL-33544 Upstream Status: 6777877eb7a3290cf0a8a6b621e46f72f9d94b6b Conflict(s): Checking file drivers/pci/pcie/aer.c; Hunk #3 FAILED at 997. Same conflict as occurred upstream related to commit e2abc47a5a1a "ACPI: APEI: Fix AER info corruption when error status data has multiple sections". See: Merge commit b8cc56d0414e "Merge tag 'cxl-for-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl" for resolution. commit 6777877eb7a3290cf0a8a6b621e46f72f9d94b6b Author: Terry Bowman <terry.bowman@amd.com> Date: Wed Oct 18 19:17:05 2023 +0200 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> Signed-off-by: Myron Stowe <mstowe@redhat.com> |
||
|---|---|---|
| .. | ||
| core | ||
| Kconfig | ||
| Makefile | ||
| acpi.c | ||
| cxl.h | ||
| cxlmem.h | ||
| cxlpci.h | ||
| mem.c | ||
| pci.c | ||
| pmem.c | ||
| port.c | ||
| security.c | ||