PCI/CXL: Export native CXL error reporting control

CXL _OSC Error Reporting Control is used by the OS to determine if
Firmware has control of various CXL error reporting capabilities
including the event logs.

Expose the result of negotiating CXL Error Reporting Control in struct
pci_host_bridge for consumption by the CXL drivers.

Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: linux-pci@vger.kernel.org
Cc: linux-acpi@vger.kernel.org
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Link: https://lore.kernel.org/r/20221212070627.1372402-2-ira.weiny@intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index b3c202d2a433153848c2a4b1713559c8a509de19..84030804a763382e322f06a1bdb47032c7cb3b0f 100644 (file)
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -1047,6 +1047,9 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
        if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL))
                host_bridge->native_dpc = 0;
 
+       if (!(root->osc_ext_control_set & OSC_CXL_ERROR_REPORTING_CONTROL))
+               host_bridge->native_cxl_error = 0;
+
        /*
         * Evaluate the "PCI Boot Configuration" _DSM Function.  If it
         * exists and returns 0, we must preserve any PCI resource

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 1779582fb5007cd1ba0b054e78c545d0d4f644c3..f796dfb9b14b686391c23850d0941dfbbe68ec5b 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -596,6 +596,7 @@ static void pci_init_host_bridge(struct pci_host_bridge *bridge)
        bridge->native_ltr = 1;
        bridge->native_dpc = 1;
        bridge->domain_nr = PCI_DOMAIN_NR_NOT_SET;
+       bridge->native_cxl_error = 1;
 
        device_initialize(&bridge->dev);
 }

diff --git a/include/linux/pci.h b/include/linux/pci.h
index adffd65e84b4e28cade5df01b412d7ac9251c25a..22319ea71ab0f902c07a11723391c6bddc4fdc39 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -578,6 +578,7 @@ struct pci_host_bridge {
        unsigned int    native_pme:1;           /* OS may use PCIe PME */
        unsigned int    native_ltr:1;           /* OS may use PCIe LTR */
        unsigned int    native_dpc:1;           /* OS may use PCIe DPC */
+       unsigned int    native_cxl_error:1;     /* OS may use CXL RAS/Events */
        unsigned int    preserve_config:1;      /* Preserve FW resource setup */
        unsigned int    size_windows:1;         /* Enable root bus sizing */
        unsigned int    msi_domain:1;           /* Bridge wants MSI domain */