diff options
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 7349058ed778..3596ac94ecff 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -132,6 +132,7 @@ struct pci_dev { | |||
132 | unsigned int is_enabled:1; /* pci_enable_device has been called */ | 132 | unsigned int is_enabled:1; /* pci_enable_device has been called */ |
133 | unsigned int is_busmaster:1; /* device is busmaster */ | 133 | unsigned int is_busmaster:1; /* device is busmaster */ |
134 | unsigned int no_msi:1; /* device may not use msi */ | 134 | unsigned int no_msi:1; /* device may not use msi */ |
135 | unsigned int block_ucfg_access:1; /* userspace config space access is blocked */ | ||
135 | 136 | ||
136 | u32 saved_config_space[16]; /* config space saved at suspend time */ | 137 | u32 saved_config_space[16]; /* config space saved at suspend time */ |
137 | struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */ | 138 | struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */ |
@@ -490,6 +491,9 @@ extern void pci_disable_msix(struct pci_dev *dev); | |||
490 | extern void msi_remove_pci_irq_vectors(struct pci_dev *dev); | 491 | extern void msi_remove_pci_irq_vectors(struct pci_dev *dev); |
491 | #endif | 492 | #endif |
492 | 493 | ||
494 | extern void pci_block_user_cfg_access(struct pci_dev *dev); | ||
495 | extern void pci_unblock_user_cfg_access(struct pci_dev *dev); | ||
496 | |||
493 | /* | 497 | /* |
494 | * PCI domain support. Sometimes called PCI segment (eg by ACPI), | 498 | * PCI domain support. Sometimes called PCI segment (eg by ACPI), |
495 | * a PCI domain is defined to be a set of PCI busses which share | 499 | * a PCI domain is defined to be a set of PCI busses which share |
@@ -560,6 +564,9 @@ static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int en | |||
560 | 564 | ||
561 | #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) | 565 | #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) |
562 | 566 | ||
567 | static inline void pci_block_user_cfg_access(struct pci_dev *dev) { } | ||
568 | static inline void pci_unblock_user_cfg_access(struct pci_dev *dev) { } | ||
569 | |||
563 | #endif /* CONFIG_PCI */ | 570 | #endif /* CONFIG_PCI */ |
564 | 571 | ||
565 | /* Include architecture-dependent settings and functions */ | 572 | /* Include architecture-dependent settings and functions */ |