diff options
Diffstat (limited to 'drivers/pci/pci.h')
-rw-r--r-- | drivers/pci/pci.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 4dbf9f96ae5b..f8113e5b9812 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
@@ -23,14 +23,14 @@ void pci_create_firmware_label_files(struct pci_dev *pdev); | |||
23 | void pci_remove_firmware_label_files(struct pci_dev *pdev); | 23 | void pci_remove_firmware_label_files(struct pci_dev *pdev); |
24 | #endif | 24 | #endif |
25 | void pci_cleanup_rom(struct pci_dev *dev); | 25 | void pci_cleanup_rom(struct pci_dev *dev); |
26 | #ifdef HAVE_PCI_MMAP | 26 | |
27 | enum pci_mmap_api { | 27 | enum pci_mmap_api { |
28 | PCI_MMAP_SYSFS, /* mmap on /sys/bus/pci/devices/<BDF>/resource<N> */ | 28 | PCI_MMAP_SYSFS, /* mmap on /sys/bus/pci/devices/<BDF>/resource<N> */ |
29 | PCI_MMAP_PROCFS /* mmap on /proc/bus/pci/<BDF> */ | 29 | PCI_MMAP_PROCFS /* mmap on /proc/bus/pci/<BDF> */ |
30 | }; | 30 | }; |
31 | int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vmai, | 31 | int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vmai, |
32 | enum pci_mmap_api mmap_api); | 32 | enum pci_mmap_api mmap_api); |
33 | #endif | 33 | |
34 | int pci_probe_reset_function(struct pci_dev *dev); | 34 | int pci_probe_reset_function(struct pci_dev *dev); |
35 | 35 | ||
36 | /** | 36 | /** |
@@ -274,8 +274,23 @@ struct pci_sriov { | |||
274 | struct pci_dev *self; /* this PF */ | 274 | struct pci_dev *self; /* this PF */ |
275 | struct mutex lock; /* lock for setting sriov_numvfs in sysfs */ | 275 | struct mutex lock; /* lock for setting sriov_numvfs in sysfs */ |
276 | resource_size_t barsz[PCI_SRIOV_NUM_BARS]; /* VF BAR size */ | 276 | resource_size_t barsz[PCI_SRIOV_NUM_BARS]; /* VF BAR size */ |
277 | bool drivers_autoprobe; /* auto probing of VFs by driver */ | ||
277 | }; | 278 | }; |
278 | 279 | ||
280 | /* pci_dev priv_flags */ | ||
281 | #define PCI_DEV_DISCONNECTED 0 | ||
282 | |||
283 | static inline int pci_dev_set_disconnected(struct pci_dev *dev, void *unused) | ||
284 | { | ||
285 | set_bit(PCI_DEV_DISCONNECTED, &dev->priv_flags); | ||
286 | return 0; | ||
287 | } | ||
288 | |||
289 | static inline bool pci_dev_is_disconnected(const struct pci_dev *dev) | ||
290 | { | ||
291 | return test_bit(PCI_DEV_DISCONNECTED, &dev->priv_flags); | ||
292 | } | ||
293 | |||
279 | #ifdef CONFIG_PCI_ATS | 294 | #ifdef CONFIG_PCI_ATS |
280 | void pci_restore_ats_state(struct pci_dev *dev); | 295 | void pci_restore_ats_state(struct pci_dev *dev); |
281 | #else | 296 | #else |