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

Bjorn Helgaas committed 6 years ago

Commit 86845e32 parents de71a00 5799dac7 files · +95 −88Browse files

Showing the changes to include/linux (1 of 7 files). Show all

Unified · Split

include/linux/pci.h+1−1

@@ -517,6 +517,7 @@ struct pci_host_bridge { · 516 unmodified lines
517	517	unsigned int native_ltr:1; /* OS may use PCIe LTR */
518	518	unsigned int native_dpc:1; /* OS may use PCIe DPC */
519	519	unsigned int preserve_config:1; /* Preserve FW resource setup */
	520	+ unsigned int size_windows:1; /* Enable root bus sizing */
520	521
521	522	/* Resource alignment requirements */
522	523	resource_size_t (align_resource)(struct pci_dev dev,
@@ -1220,7 +1221,6 @@ int pci_enable_rom(struct pci_dev *pdev); · 697 unmodified lines
1220	1221	void pci_disable_rom(struct pci_dev *pdev);
1221	1222	void __iomem __must_check pci_map_rom(struct pci_dev pdev, size_t *size);
1222	1223	void pci_unmap_rom(struct pci_dev pdev, void __iomem rom);
1223		−void __iomem __must_check pci_platform_rom(struct pci_dev pdev, size_t *size);
1224	1224
1225	1225	/* Power management related routines */
1226	1226	int pci_save_state(struct pci_dev *dev);