diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2024-05-16 18:14:09 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-05-16 18:14:09 -0500 |
commit | 83711a1ab210cf59d30a3e65f72268f5404c1870 (patch) | |
tree | 65f9202cc2aa46c84b87f4c4f71d76eb3f388f01 /include/linux/pci.h | |
parent | a6faf3f450ecdb084128751e8fda0e515283da39 (diff) | |
parent | 934edcd436dca0447e0d3691a908394ba16d06c3 (diff) | |
download | linux-83711a1ab210cf59d30a3e65f72268f5404c1870.tar.gz linux-83711a1ab210cf59d30a3e65f72268f5404c1870.tar.bz2 linux-83711a1ab210cf59d30a3e65f72268f5404c1870.zip |
Merge branch 'pci/cxl'
- Lock the upstream bridge while using it to perform a Secondary Bus Reset
(Dave Jiang)
- Return failure when attempting Secondary Bus Reset below a CXL Port that
has SBR masked (Dave Jiang)
- Add a "cxl_bus" reset method that temporarily unmasks SBR (Dave Jiang)
- Add a warning if we reset a CXL type 3 memory device that was in use
while being reset (Dave Jiang)
* pci/cxl:
cxl: Add post-reset warning if reset results in loss of previously committed HDM decoders
PCI/CXL: Add 'cxl_bus' reset method for devices below CXL Ports
PCI/CXL: Fail bus reset if upstream CXL Port has SBR masked
PCI: Lock upstream bridge for pci_reset_function()
PCI/CXL: Move CXL Vendor ID to pci_ids.h
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 08c68d80c01a..8d6ee97784e0 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -51,7 +51,7 @@ PCI_STATUS_PARITY) /* Number of reset methods used in pci_reset_fn_methods array in pci.c */ -#define PCI_NUM_RESET_METHODS 7 +#define PCI_NUM_RESET_METHODS 8 #define PCI_RESET_PROBE true #define PCI_RESET_DO_RESET false @@ -413,6 +413,8 @@ struct pci_dev { struct resource driver_exclusive_resource; /* driver exclusive resource ranges */ bool match_driver; /* Skip attaching driver */ + struct lock_class_key cfg_access_key; + struct lockdep_map cfg_access_lock; unsigned int transparent:1; /* Subtractive decode bridge */ unsigned int io_window:1; /* Bridge has I/O window */ |