Merge tag 'pci-v5.3-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[sfrench/cifs-2.6.git] / drivers / pci / probe.c

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index f9ef7ad3f75d2efbbc60e31646e99aad33c7e4e0..a3c7338fad86413374f0f40c19df6974f82acd46 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -668,7 +668,7 @@ const unsigned char pcie_link_speed[] = {
        PCIE_SPEED_5_0GT,               /* 2 */
        PCIE_SPEED_8_0GT,               /* 3 */
        PCIE_SPEED_16_0GT,              /* 4 */
-       PCI_SPEED_UNKNOWN,              /* 5 */
+       PCIE_SPEED_32_0GT,              /* 5 */
        PCI_SPEED_UNKNOWN,              /* 6 */
        PCI_SPEED_UNKNOWN,              /* 7 */
        PCI_SPEED_UNKNOWN,              /* 8 */
@@ -1555,17 +1555,6 @@ static int pci_cfg_space_size_ext(struct pci_dev *dev)
        return PCI_CFG_SPACE_EXP_SIZE;
 }
 
-#ifdef CONFIG_PCI_IOV
-static bool is_vf0(struct pci_dev *dev)
-{
-       if (pci_iov_virtfn_devfn(dev->physfn, 0) == dev->devfn &&
-           pci_iov_virtfn_bus(dev->physfn, 0) == dev->bus->number)
-               return true;
-
-       return false;
-}
-#endif
-
 int pci_cfg_space_size(struct pci_dev *dev)
 {
        int pos;
@@ -1573,9 +1562,18 @@ int pci_cfg_space_size(struct pci_dev *dev)
        u16 class;
 
 #ifdef CONFIG_PCI_IOV
-       /* Read cached value for all VFs except for VF0 */
-       if (dev->is_virtfn && !is_vf0(dev))
-               return dev->physfn->sriov->cfg_size;
+       /*
+        * Per the SR-IOV specification (rev 1.1, sec 3.5), VFs are required to
+        * implement a PCIe capability and therefore must implement extended
+        * config space.  We can skip the NO_EXTCFG test below and the
+        * reachability/aliasing test in pci_cfg_space_size_ext() by virtue of
+        * the fact that the SR-IOV capability on the PF resides in extended
+        * config space and must be accessible and non-aliased to have enabled
+        * support for this VF.  This is a micro performance optimization for
+        * systems supporting many VFs.
+        */
+       if (dev->is_virtfn)
+               return PCI_CFG_SPACE_EXP_SIZE;
 #endif
 
        if (dev->bus->bus_flags & PCI_BUS_FLAGS_NO_EXTCFG)