diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-01-02 22:31:06 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-01-02 22:31:06 +0100 |
| commit | 6ee86cac1cc415031b443d8b584305696a300d1e (patch) | |
| tree | 7aa14c4e08128d3b0709658b814cbbdaa01fe006 /arch | |
| parent | Merge branch 'pci/switchtec' (diff) | |
| parent | s390/pci: skip VF scanning (diff) | |
| download | linux-6ee86cac1cc415031b443d8b584305696a300d1e.tar.xz linux-6ee86cac1cc415031b443d8b584305696a300d1e.zip | |
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 'arch')
| -rw-r--r-- | arch/s390/pci/pci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 9f6f392a4461..4266a4de3160 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -651,6 +651,9 @@ int pcibios_add_device(struct pci_dev *pdev) struct resource *res; int i; + if (pdev->is_physfn) + pdev->no_vf_scan = 1; + pdev->dev.groups = zpci_attr_groups; pdev->dev.dma_ops = &s390_pci_dma_ops; zpci_map_resources(pdev); |