1 files changed, 23 insertions, 3 deletions

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 7469b5346643..2297ec193eb4 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2008,6 +2008,7 @@ static struct dmar_domain *get_domain_for_dev(struct pci_dev *pdev, int gaw)
         if (!drhd) {
                 printk(KERN_ERR "IOMMU: can't find DMAR for device %s\n",
                         pci_name(pdev));
+                free_domain_mem(domain);
                 return NULL;
         }
         iommu = drhd->iommu;
@@ -4124,8 +4125,13 @@ static int intel_iommu_add_device(struct device *dev)
         } else
                 dma_pdev = pci_dev_get(pdev);
 
+        /* Account for quirked devices */
         swap_pci_ref(&dma_pdev, pci_get_dma_source(dma_pdev));
 
+        /*
+         * If it's a multifunction device that does not support our
+         * required ACS flags, add to the same group as function 0.
+         */
         if (dma_pdev->multifunction &&
             !pci_acs_enabled(dma_pdev, REQ_ACS_FLAGS))
                 swap_pci_ref(&dma_pdev,
@@ -4133,14 +4139,28 @@ static int intel_iommu_add_device(struct device *dev)
                                           PCI_DEVFN(PCI_SLOT(dma_pdev->devfn),
                                           0)));
 
+        /*
+         * Devices on the root bus go through the iommu.  If that's not us,
+         * find the next upstream device and test ACS up to the root bus.
+         * Finding the next device may require skipping virtual buses.
+         */
         while (!pci_is_root_bus(dma_pdev->bus)) {
-                if (pci_acs_path_enabled(dma_pdev->bus->self,
-                                         NULL, REQ_ACS_FLAGS))
+                struct pci_bus *bus = dma_pdev->bus;
+
+                while (!bus->self) {
+                        if (!pci_is_root_bus(bus))
+                                bus = bus->parent;
+                        else
+                                goto root_bus;
+                }
+
+                if (pci_acs_path_enabled(bus->self, NULL, REQ_ACS_FLAGS))
                         break;
 
-                swap_pci_ref(&dma_pdev, pci_dev_get(dma_pdev->bus->self));
+                swap_pci_ref(&dma_pdev, pci_dev_get(bus->self));
         }
 
+root_bus:
         group = iommu_group_get(&dma_pdev->dev);
         pci_dev_put(dma_pdev);
         if (!group) {