PCI/IOV: Use VF0 cached config space size for other VFs

Cache the config space size from VF0 and use it for all other VFs instead
of reading it from the config space of each VF.  We assume that it will be
the same across all associated VFs.

This is an optimization when enabling SR-IOV on a device with many VFs.

Signed-off-by: KarimAllah Ahmed <karahmed@amazon.de>
[bhelgaas: use CONFIG_PCI_IOV (not CONFIG_PCI_ATS)]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index c5f3cd4ed766f8d79798e8e22a8e12f56764333f..4238b539f9d8a6c3a698a333a568d1c6ce31346e 100644 (file)
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -133,6 +133,8 @@ static void pci_read_vf_config_common(struct pci_dev *virtfn)
                             &physfn->sriov->subsystem_vendor);
        pci_read_config_word(virtfn, PCI_SUBSYSTEM_ID,
                             &physfn->sriov->subsystem_device);
+
+       physfn->sriov->cfg_size = pci_cfg_space_size(virtfn);
 }
 
 int pci_iov_add_virtfn(struct pci_dev *dev, int id)

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 6e0d1528d471c7970613680f88333480389b6ef4..2f1454209257984a18bf764ecd23132cc6866dc4 100644 (file)
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -285,6 +285,7 @@ struct pci_sriov {
        u16             driver_max_VFs; /* Max num VFs driver supports */
        struct pci_dev  *dev;           /* Lowest numbered PF */
        struct pci_dev  *self;          /* This PF */
+       u32             cfg_size;       /* VF config space size */
        u32             class;          /* VF device */
        u8              hdr_type;       /* VF header type */
        u16             subsystem_vendor; /* VF subsystem vendor */

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 201f9e5ff55c0a97e330d9dcf139f8d2cd96bad1..575315bb7c4c5519fcec13da1f8d129000c32c17 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1438,12 +1438,29 @@ 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;
        u32 status;
        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;
+#endif
+
        if (dev->bus->bus_flags & PCI_BUS_FLAGS_NO_EXTCFG)
                return PCI_CFG_SPACE_SIZE;