summaryrefslogtreecommitdiffstats
path: root/drivers/pci
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/pci
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/pci')
-rw-r--r--drivers/pci/probe.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 1779582fb500..f796dfb9b14b 100644
--- 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);
}