diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-01-02 16:31:06 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-01-02 16:31:06 -0500 |
| commit | 6ee86cac1cc415031b443d8b584305696a300d1e (patch) | |
| tree | 7aa14c4e08128d3b0709658b814cbbdaa01fe006 /include/linux | |
| parent | 54aed1909db69f9b160bf36dd4ec314f0c91b56a (diff) | |
| parent | 7dc20ab1b9c431b792a6fe1e78baf36b63edc5e3 (diff) | |
Merge branch 'pci/virtualization'
- Skip VF scanning on powerpc, which does this in firmware (Sebastian
Ott)
* pci/virtualization:
s390/pci: skip VF scanning
PCI/IOV: Add flag so platforms can skip VF scanning
PCI/IOV: Factor out sriov_add_vfs()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index a6cd567c3fc1..8e3c646bc15c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -405,6 +405,7 @@ struct pci_dev { | |||
| 405 | unsigned int non_compliant_bars:1; /* Broken BARs; ignore them */ | 405 | unsigned int non_compliant_bars:1; /* Broken BARs; ignore them */ |
| 406 | unsigned int is_probed:1; /* Device probing in progress */ | 406 | unsigned int is_probed:1; /* Device probing in progress */ |
| 407 | unsigned int link_active_reporting:1;/* Device capable of reporting link active */ | 407 | unsigned int link_active_reporting:1;/* Device capable of reporting link active */ |
| 408 | unsigned int no_vf_scan:1; /* Don't scan for VFs after IOV enablement */ | ||
| 408 | pci_dev_flags_t dev_flags; | 409 | pci_dev_flags_t dev_flags; |
| 409 | atomic_t enable_cnt; /* pci_enable_device has been called */ | 410 | atomic_t enable_cnt; /* pci_enable_device has been called */ |
| 410 | 411 | ||