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

[firefly-linux-kernel-4.4.55.git] / drivers / iommu / intel-iommu.c

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index f93d5ac8f81c0b2ff02b6f97b2ae079b8b3f80a7..abab245371eed7db24796606d080bebe68f925dc 100644 (file)
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -42,6 +42,7 @@
 #include <linux/dmi.h>
 #include <linux/pci-ats.h>
 #include <linux/memblock.h>
+#include <asm/irq_remapping.h>
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
 
@@ -2286,12 +2287,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 +2299,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;
 }
 
@@ -4082,7 +4088,7 @@ static int intel_iommu_domain_has_cap(struct iommu_domain *domain,
        if (cap == IOMMU_CAP_CACHE_COHERENCY)
                return dmar_domain->iommu_snooping;
        if (cap == IOMMU_CAP_INTR_REMAP)
-               return intr_remapping_enabled;
+               return irq_remapping_enabled;
 
        return 0;
 }