History

Merge branch 'pci/resource'

- Protect pci_reassign_bridge_resources() against concurrent addition/removal (Benjamin Herrenschmidt) - Fix bridge dma_ranges resource list cleanup (Rob Herring) - Add PCI_STD_NUM_BARS for the number of standard BARs (Denis Efremov) - Add "pci=hpmmiosize" and "pci=hpmmioprefsize" parameters to control the MMIO and prefetchable MMIO window sizes of hotplug bridges independently (Nicholas Johnson) - Fix MMIO/MMIO_PREF window assignment that assigned more space than desired (Nicholas Johnson) - Only enforce bus numbers from bridge EA if the bridge has EA devices downstream (Subbaraya Sundeep) * pci/resource: PCI: Do not use bus number zero from EA capability PCI: Avoid double hpmemsize MMIO window assignment PCI: Add "pci=hpmmiosize" and "pci=hpmmioprefsize" parameters PCI: Add PCI_STD_NUM_BARS for the number of standard BARs PCI: Fix missing bridge dma_ranges resource list cleanup PCI: Protect pci_reassign_bridge_resources() against concurrent addition/removal

Bjorn Helgaas committed 6 years ago

Commit 774800c2 parents 7cfe163 73884a750 files · +195 −147Browse files

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

Unified · Split

include/uapi/linux/pci_regs.h+1−0
@@ -34,6 +34,7 @@ · 33 unmodified lines
3434 * of which the first 64 bytes are standardized as follows:
3535 */
3636 #define PCI_STD_HEADER_SIZEOF 64
37+#define PCI_STD_NUM_BARS 6 /* Number of standard BARs */
3738 #define PCI_VENDOR_ID 0x00 /* 16 bits */
3839 #define PCI_DEVICE_ID 0x02 /* 16 bits */
3940 #define PCI_COMMAND 0x04 /* 16 bits */