diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2019-07-12 17:08:28 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-07-12 17:08:28 -0500 |
| commit | 8c6af6f04252110b3e4c2ff1614a4518d5208383 (patch) | |
| tree | 2c8c4cbeca0d6bbb71a98de26342a05f9a41803a /include | |
| parent | Merge branch 'pci/peer-to-peer' (diff) | |
| parent | PCI: Skip resource distribution when no hotplug bridges (diff) | |
| download | linux-dev-8c6af6f04252110b3e4c2ff1614a4518d5208383.tar.xz linux-dev-8c6af6f04252110b3e4c2ff1614a4518d5208383.zip | |
Merge branch 'pci/resource'
- Evaluate ACPI "PCI Boot Configuration"_DSM (Benjamin Herrenschmidt)
- Don't auto-realloc if we're preserving firmware config (Benjamin
Herrenschmidt)
- Allow arm64 to reallocate resources if necessary (Benjamin
Herrenschmidt)
- Preserve firmware config on arm64 when desired (Benjamin Herrenschmidt)
- Simplify resource distribution to hotplug bridges (Nicholas Johnson)
* pci/resource:
PCI: Skip resource distribution when no hotplug bridges
PCI: Simplify pci_bus_distribute_available_resources()
arm64: PCI: Preserve firmware configuration when desired
arm64: PCI: Allow resource reallocation if necessary
PCI: Don't auto-realloc if we're preserving firmware config
PCI/ACPI: Evaluate PCI Boot Configuration _DSM
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci-acpi.h | 7 | ||||
| -rw-r--r-- | include/linux/pci.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index 8082b612f561..62b7fdcc661c 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h @@ -107,9 +107,10 @@ static inline void acpiphp_check_host_bridge(struct acpi_device *adev) { } #endif extern const guid_t pci_acpi_dsm_guid; -#define DEVICE_LABEL_DSM 0x07 -#define RESET_DELAY_DSM 0x08 -#define FUNCTION_DELAY_DSM 0x09 +#define IGNORE_PCI_BOOT_CONFIG_DSM 0x05 +#define DEVICE_LABEL_DSM 0x07 +#define RESET_DELAY_DSM 0x08 +#define FUNCTION_DELAY_DSM 0x09 #else /* CONFIG_ACPI */ static inline void acpi_pci_add_bus(struct pci_bus *bus) { } diff --git a/include/linux/pci.h b/include/linux/pci.h index ea91e79d0ba6..bf6ea6fe39ff 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -508,6 +508,8 @@ struct pci_host_bridge { unsigned int native_shpc_hotplug:1; /* OS may use SHPC hotplug */ unsigned int native_pme:1; /* OS may use PCIe PME */ unsigned int native_ltr:1; /* OS may use PCIe LTR */ + unsigned int preserve_config:1; /* Preserve FW resource setup */ + /* Resource alignment requirements */ resource_size_t (*align_resource)(struct pci_dev *dev, const struct resource *res, |