1 files changed, 17 insertions, 5 deletions

diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 6bacb8995e96..677924ae0350 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/pci/iov.c
  *
@@ -259,19 +260,19 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
                         nres++;
         }
         if (nres != iov->nres) {
-                dev_err(&dev->dev, "not enough MMIO resources for SR-IOV\n");
+                pci_err(dev, "not enough MMIO resources for SR-IOV\n");
                 return -ENOMEM;
         }
 
         bus = pci_iov_virtfn_bus(dev, nr_virtfn - 1);
         if (bus > dev->bus->busn_res.end) {
-                dev_err(&dev->dev, "can't enable %d VFs (bus %02x out of range of %pR)\n",
+                pci_err(dev, "can't enable %d VFs (bus %02x out of range of %pR)\n",
                         nr_virtfn, bus, &dev->bus->busn_res);
                 return -ENOMEM;
         }
 
         if (pci_enable_resources(dev, bars)) {
-                dev_err(&dev->dev, "SR-IOV: IOV BARS not allocated\n");
+                pci_err(dev, "SR-IOV: IOV BARS not allocated\n");
                 return -ENOMEM;
         }
 
@@ -298,7 +299,7 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
 
         rc = pcibios_sriov_enable(dev, initial);
         if (rc) {
-                dev_err(&dev->dev, "failure %d from pcibios_sriov_enable()\n", rc);
+                pci_err(dev, "failure %d from pcibios_sriov_enable()\n", rc);
                 goto err_pcibios;
         }
 
@@ -432,7 +433,7 @@ found:
                 }
                 iov->barsz[i] = resource_size(res);
                 res->end = res->start + resource_size(res) * total - 1;
-                dev_info(&dev->dev, "VF(n) BAR%d space: %pR (contains BAR%d for %d VFs)\n",
+                pci_info(dev, "VF(n) BAR%d space: %pR (contains BAR%d for %d VFs)\n",
                          i, res, i, total);
                 i += bar64;
                 nres++;
@@ -636,6 +637,17 @@ void pci_restore_iov_state(struct pci_dev *dev)
 }
 
 /**
+ * pci_vf_drivers_autoprobe - set PF property drivers_autoprobe for VFs
+ * @dev: the PCI device
+ * @auto_probe: set VF drivers auto probe flag
+ */
+void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool auto_probe)
+{
+        if (dev->is_physfn)
+                dev->sriov->drivers_autoprobe = auto_probe;
+}
+
+/**
  * pci_iov_bus_range - find bus range used by Virtual Function
  * @bus: the PCI bus
  *