diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-02-07 22:12:24 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-02-07 22:12:24 +0300 |
| commit | 5485eb955994a238eafd08d9266005b1c9ac7991 (patch) | |
| tree | fad2a31e1f9340de6aecbec16fa18509409ff5d1 /drivers/acpi | |
| parent | 711442e29f16f0d39dd0e2460c9baacfccb9d5a7 (diff) | |
| parent | 623c0751336e4035ab0047f2c152a02bd26b612b (diff) | |
| download | linux-5485eb955994a238eafd08d9266005b1c9ac7991.tar.xz | |
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.c | 3 |
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 |