intel-iommu: Add device info into list before doing context mapping

PATCH New Xudong Hao 1 participant 1 message May 4, 2012 IOMMU

Share & tools

Xudong Hao

author

2012-05-04 01:24 UTC #0 lore raw

PATCH v2 1/1 intel-iommu: Add device info into list before doing context mapping

Add device info into list before do context mapping, because device info will be
used by iommu_enable_dev_iotlb function, in this function, pci_enable_ats would not be called without this patch.

Signed-off-by Xudong Hao <[email protected]>

Signed-off-by Xiantao Zhang <[email protected]>

Acked-by Chris Wright <[email protected]>

---
 drivers/iommu/intel-iommu.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

drivers/iommu/intel-iommu.c +11 -6

index f93d5ac..5fda348 100644
@@ -2286,12 +2286,6 @@ static int domain_add_dev_info(struct dmar_domain *domain,
    if (!info)
        return -ENOMEM;
 
-   ret = domain_context_mapping(domain, pdev, translation);
-   if (ret) {
-       free_devinfo_mem(info);
-       return ret;
-   }
-
    info->segment = pci_domain_nr(pdev->bus);
    info->bus = pdev->bus->number;
    info->devfn = pdev->devfn;

@@ -2304,6 +2298,17 @@ static int domain_add_dev_info(struct dmar_domain *domain,
    pdev->dev.archdata.iommu = info;
    spin_unlock_irqrestore(&device_domain_lock, flags);
 
+   ret = domain_context_mapping(domain, pdev, translation);
+   if (ret) {
+       spin_lock_irqsave(&device_domain_lock, flags);
+       list_del(&info->link);
+       list_del(&info->global);
+       pdev->dev.archdata.iommu = NULL;
+       spin_unlock_irqrestore(&device_domain_lock, flags);
+       free_devinfo_mem(info);
+       return ret;
+   }
+
    return 0;
 }

--
1.6.0.rc1