summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2023-02-07 20:12:24 +0100
committerDan Williams <dan.j.williams@intel.com>2023-02-07 20:12:24 +0100
commit5485eb955994a238eafd08d9266005b1c9ac7991 (patch)
treefad2a31e1f9340de6aecbec16fa18509409ff5d1 /drivers/acpi
parentcxl/region: Fix passthrough-decoder detection (diff)
parentcxl/mbox: Fix Payload Length check for Get Log command (diff)
downloadlinux-5485eb955994a238eafd08d9266005b1c9ac7991.tar.xz
linux-5485eb955994a238eafd08d9266005b1c9ac7991.zip
Merge branch 'for-6.3/cxl' into cxl/next
Merge the general CXL updates with fixes targeting v6.2-rc for v6.3. Resolve a conflict with the fix and move of cxl_report_and_clear() from pci.c to core/pci.c.
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/pci_root.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index b3c202d2a433..84030804a763 100644
--- 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