diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 11:40:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 11:40:04 +1100 |
| commit | dba2a443810198de46a44f6b666d38f57417b3ef (patch) | |
| tree | bfc9a0062c6a29a5f4f6cc9eb11128da39e41433 /include | |
| parent | e49536f3dedd48b725e55f91a2ba6ea9d641d073 (diff) | |
| parent | 5e19c6fc65fa55bcf4d5af2447151f7e320ead54 (diff) | |
Merge remote branch 'pci/linux-next'
Conflicts:
drivers/pci/pci-sysfs.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_regs.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h index af83076c31a6..d4f2c80a6c3e 100644 --- a/include/linux/pci_regs.h +++ b/include/linux/pci_regs.h @@ -309,6 +309,14 @@ #define PCI_MSIX_PBA 8 #define PCI_MSIX_FLAGS_BIRMASK (7 << 0) +/* MSI-X entry's format */ +#define PCI_MSIX_ENTRY_SIZE 16 +#define PCI_MSIX_ENTRY_LOWER_ADDR 0 +#define PCI_MSIX_ENTRY_UPPER_ADDR 4 +#define PCI_MSIX_ENTRY_DATA 8 +#define PCI_MSIX_ENTRY_VECTOR_CTRL 12 +#define PCI_MSIX_ENTRY_CTRL_MASKBIT 1 + /* CompactPCI Hotswap Register */ #define PCI_CHSWP_CSR 2 /* Control and Status Register */ |