Merge tag 'iommu-fixes-v5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull iommu fixes from Joerg Roedel:

 - three fixes for Intel VT-d to fix a potential dead-lock, a formatting
   fix and a bit setting fix

 - one fix for the ARM-SMMU to make it work on some platforms with
   sub-optimal SMMU emulation

* tag 'iommu-fixes-v5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/arm-smmu: Avoid constant zero in TLBI writes
  iommu/vt-d: Set the right field for Page Walk Snoop
  iommu/vt-d: Fix lock inversion between iommu->lock and device_domain_lock
  iommu: Add missing new line for dma type

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 162b3236e72c..56297298d6ee 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2504,6 +2504,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
                 }
         }
 
+        spin_lock(&iommu->lock);
         spin_lock_irqsave(&device_domain_lock, flags);
         if (dev)
                 found = find_domain(dev);
@@ -2519,17 +2520,16 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
 
         if (found) {
                 spin_unlock_irqrestore(&device_domain_lock, flags);
+                spin_unlock(&iommu->lock);
                 free_devinfo_mem(info);
                 /* Caller must free the original domain */
                 return found;
         }
 
-        spin_lock(&iommu->lock);
         ret = domain_attach_iommu(domain, iommu);
-        spin_unlock(&iommu->lock);
-
         if (ret) {
                 spin_unlock_irqrestore(&device_domain_lock, flags);
+                spin_unlock(&iommu->lock);
                 free_devinfo_mem(info);
                 return NULL;
         }
@@ -2539,6 +2539,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
         if (dev)
                 dev->archdata.iommu = info;
         spin_unlock_irqrestore(&device_domain_lock, flags);
+        spin_unlock(&iommu->lock);
 
         /* PASID table is mandatory for a PCI device in scalable mode. */
         if (dev && dev_is_pci(dev) && sm_supported(iommu)) {