History

Merge branch 'pci/resource' into next

* pci/resource: PCI: Fail pci_map_rom() if the option ROM is invalid PCI: Move pci_map_rom() error path x86/PCI: Enable a 64bit BAR on AMD Family 15h (Models 00-1f, 30-3f, 60-7f) PCI: Add pci_resize_resource() for resizing BARs PCI: Add resizable BAR infrastructure PCI: Add PCI resource type mask #define

Bjorn Helgaas committed 9 years ago

Commit 104d1e42 parents 8dceeaf a405f198 files · +380 −17Browse files

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

Unified · Split

include/uapi/linux/pci_regs.h+6−2
@@ -940,9 +940,13 @@ · 939 unmodified lines
940#define PCI_SATA_SIZEOF_LONG 16940#define PCI_SATA_SIZEOF_LONG 16
941 941
942/* Resizable BARs */942/* Resizable BARs */
943#define PCI_REBAR_CAP 4 /* capability register */
944#define PCI_REBAR_CAP_SIZES 0x00FFFFF0 /* supported BAR sizes */
943#define PCI_REBAR_CTRL 8 /* control register */945#define PCI_REBAR_CTRL 8 /* control register */
944#define PCI_REBAR_CTRL_NBAR_MASK (7 << 5) /* mask for # bars */946#define PCI_REBAR_CTRL_BAR_IDX 0x00000007 /* BAR index */
945#define PCI_REBAR_CTRL_NBAR_SHIFT 5 /* shift for # bars */947#define PCI_REBAR_CTRL_NBAR_MASK 0x000000E0 /* # of resizable BARs */
948#define PCI_REBAR_CTRL_NBAR_SHIFT 5 /* shift for # of BARs */
949#define PCI_REBAR_CTRL_BAR_SIZE 0x00001F00 /* BAR size */
946 950
947/* Dynamic Power Allocation */951/* Dynamic Power Allocation */
948#define PCI_DPA_CAP 4 /* capability register */952#define PCI_DPA_CAP 4 /* capability register */