1 files changed, 21 insertions, 3 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 201f9e5ff55c..b1c05b5054a0 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -713,6 +713,7 @@ static void pci_set_bus_speed(struct pci_bus *bus)
 
                 pcie_capability_read_dword(bridge, PCI_EXP_LNKCAP, &linkcap);
                 bus->max_bus_speed = pcie_link_speed[linkcap & PCI_EXP_LNKCAP_SLS];
+                bridge->link_active_reporting = !!(linkcap & PCI_EXP_LNKCAP_DLLLARC);
 
                 pcie_capability_read_word(bridge, PCI_EXP_LNKSTA, &linksta);
                 pcie_update_link_speed(bus, linksta);
@@ -1438,12 +1439,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;
 
@@ -2143,7 +2161,7 @@ static void pci_release_dev(struct device *dev)
         pcibios_release_device(pci_dev);
         pci_bus_put(pci_dev->bus);
         kfree(pci_dev->driver_override);
-        kfree(pci_dev->dma_alias_mask);
+        bitmap_free(pci_dev->dma_alias_mask);
         kfree(pci_dev);
 }
 
@@ -2397,8 +2415,8 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
         dev->dev.dma_parms = &dev->dma_parms;
         dev->dev.coherent_dma_mask = 0xffffffffull;
 
-        pci_set_dma_max_seg_size(dev, 65536);
-        pci_set_dma_seg_boundary(dev, 0xffffffff);
+        dma_set_max_seg_size(&dev->dev, 65536);
+        dma_set_seg_boundary(&dev->dev, 0xffffffff);
 
         /* Fix up broken headers */
         pci_fixup_device(pci_fixup_header, dev);