diff options
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index c75b82bda32..03b0b8c3c81 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -134,6 +134,11 @@ enum pci_dev_flags { | |||
134 | PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2, | 134 | PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2, |
135 | }; | 135 | }; |
136 | 136 | ||
137 | enum pci_irq_reroute_variant { | ||
138 | INTEL_IRQ_REROUTE_VARIANT = 1, | ||
139 | MAX_IRQ_REROUTE_VARIANTS = 3 | ||
140 | }; | ||
141 | |||
137 | typedef unsigned short __bitwise pci_bus_flags_t; | 142 | typedef unsigned short __bitwise pci_bus_flags_t; |
138 | enum pci_bus_flags { | 143 | enum pci_bus_flags { |
139 | PCI_BUS_FLAGS_NO_MSI = (__force pci_bus_flags_t) 1, | 144 | PCI_BUS_FLAGS_NO_MSI = (__force pci_bus_flags_t) 1, |
@@ -218,6 +223,7 @@ struct pci_dev { | |||
218 | unsigned int no_msi:1; /* device may not use msi */ | 223 | unsigned int no_msi:1; /* device may not use msi */ |
219 | unsigned int block_ucfg_access:1; /* userspace config space access is blocked */ | 224 | unsigned int block_ucfg_access:1; /* userspace config space access is blocked */ |
220 | unsigned int broken_parity_status:1; /* Device generates false positive parity */ | 225 | unsigned int broken_parity_status:1; /* Device generates false positive parity */ |
226 | unsigned int irq_reroute_variant:2; /* device needs IRQ rerouting variant */ | ||
221 | unsigned int msi_enabled:1; | 227 | unsigned int msi_enabled:1; |
222 | unsigned int msix_enabled:1; | 228 | unsigned int msix_enabled:1; |
223 | unsigned int ari_enabled:1; /* ARI forwarding */ | 229 | unsigned int ari_enabled:1; /* ARI forwarding */ |
@@ -1136,7 +1142,7 @@ static inline void pci_mmcfg_late_init(void) { } | |||
1136 | #endif | 1142 | #endif |
1137 | 1143 | ||
1138 | #ifdef CONFIG_HAS_IOMEM | 1144 | #ifdef CONFIG_HAS_IOMEM |
1139 | static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar) | 1145 | static inline void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar) |
1140 | { | 1146 | { |
1141 | /* | 1147 | /* |
1142 | * Make sure the BAR is actually a memory resource, not an IO resource | 1148 | * Make sure the BAR is actually a memory resource, not an IO resource |