diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-04-02 22:26:43 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-04-02 22:26:43 +0300 |
| commit | 86845e37aca4c80eace290a727a49caa8390febb (patch) | |
| tree | 56b644c875bd1db5a5ab4023a4efd370e4b4166c /include/linux/pci.h | |
| parent | de71a000a15fc7beb2dedc84f7ea9c25d89e368d (diff) | |
| parent | 5799dac9c38a9585bc021bcb965623b835f24b1f (diff) | |
| download | linux-86845e37aca4c80eace290a727a49caa8390febb.tar.xz | |
Merge branch 'pci/resource'
- Use ioremap(), not phys_to_virt() for platform ROM, to fix video ROM
mapping with CONFIG_HIGHMEM (Mikel Rychliski)
- Add support for root bus sizing so we don't have to assume host bridge
windows are known a priori (Ivan Kokshaysky)
- Fix alpha Nautilus PCI setup, which has been broken since we started
enforcing window limits in resource allocation (Ivan Kokshaysky)
* pci/resource:
alpha: Fix nautilus PCI setup
PCI: Add support for root bus sizing
PCI: Use ioremap(), not phys_to_virt() for platform ROM
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 226908b4dc64..71c92b88bbc6 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -517,6 +517,7 @@ struct pci_host_bridge { unsigned int native_ltr:1; /* OS may use PCIe LTR */ unsigned int native_dpc:1; /* OS may use PCIe DPC */ unsigned int preserve_config:1; /* Preserve FW resource setup */ + unsigned int size_windows:1; /* Enable root bus sizing */ /* Resource alignment requirements */ resource_size_t (*align_resource)(struct pci_dev *dev, @@ -1220,7 +1221,6 @@ int pci_enable_rom(struct pci_dev *pdev); void pci_disable_rom(struct pci_dev *pdev); void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size); void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom); -void __iomem __must_check *pci_platform_rom(struct pci_dev *pdev, size_t *size); /* Power management related routines */ int pci_save_state(struct pci_dev *dev); |