diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 17:58:34 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 17:58:34 +0300 |
commit | 28a18aec59551e0f86f0983c0eec7b6470632790 (patch) | |
tree | 58a2831fa644f19b8b2c44ea93fe30a2435ea3fb /include | |
parent | a9f379068cc6e63fc64ac9bab635e633a953857f (diff) | |
parent | b0e85c3c8554944c6ec599656931b54062c38823 (diff) | |
download | linux-28a18aec59551e0f86f0983c0eec7b6470632790.tar.xz |
Merge branch 'pci/enumeration'
- Tone down message about missing optional MCFG (Jeremy Linton)
- Add schedule point in pci_read_config() (Jiang Biao)
- Add Ampere Altra SOC MCFG quirk (Tuan Phan)
- Add Kconfig options for MPS/MRRS strategy (Jim Quinlan)
* pci/enumeration:
PCI: Add Kconfig options for MPS/MRRS strategy
PCI/ACPI: Add Ampere Altra SOC MCFG quirk
PCI: Add schedule point in pci_read_config()
PCI/ACPI: Tone down missing MCFG message
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pci-ecam.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h index 1af5cb02ef7f..033ce74f02e8 100644 --- a/include/linux/pci-ecam.h +++ b/include/linux/pci-ecam.h @@ -51,6 +51,7 @@ extern const struct pci_ecam_ops pci_generic_ecam_ops; #if defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS) extern const struct pci_ecam_ops pci_32b_ops; /* 32-bit accesses only */ +extern const struct pci_ecam_ops pci_32b_read_ops; /* 32-bit read only */ extern const struct pci_ecam_ops hisi_pcie_ops; /* HiSilicon */ extern const struct pci_ecam_ops thunder_pem_ecam_ops; /* Cavium ThunderX 1.x & 2.x */ extern const struct pci_ecam_ops pci_thunder_ecam_ops; /* Cavium ThunderX 1.x */ |