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

Pul IOMMU fixes from Joerg Roedel:
 "Four fixes have queued up to fix regressions introduced after v4.1:

   - Don't fail IOMMU driver initialization when the add_device
     call-back returns -ENODEV, as that just means that the device is
     not translated by the IOMMU.  This is pretty common on ARM.

   - Two fixes for the ARM-SMMU driver for a wrong feature check and to
     remove a redundant NULL check.

   - A fix for the AMD IOMMU driver to fix a boot panic on systems where
     the BIOS requests Unity Mappings in the IVRS table"

* tag 'iommu-fixes-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: Introduce protection_domain_init() function
  iommu/arm-smmu: Delete an unnecessary check before the function call "free_io_pgtable_ops"
  iommu/arm-smmu: Fix broken ATOS check
  iommu: Ignore -ENODEV errors from add_device call-back

4 files changed, 30 insertions, 14 deletions

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index d3e5e9abe3b6..a57e9b749895 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -117,6 +117,7 @@ struct kmem_cache *amd_iommu_irq_cache;
 
 static void update_domain(struct protection_domain *domain);
 static int alloc_passthrough_domain(void);
+static int protection_domain_init(struct protection_domain *domain);
 
 /****************************************************************************
  *
@@ -1881,12 +1882,9 @@ static struct dma_ops_domain *dma_ops_domain_alloc(void)
         if (!dma_dom)
                 return NULL;
 
-        spin_lock_init(&dma_dom->domain.lock);
-
-        dma_dom->domain.id = domain_id_alloc();
-        if (dma_dom->domain.id == 0)
+        if (protection_domain_init(&dma_dom->domain))
                 goto free_dma_dom;
-        INIT_LIST_HEAD(&dma_dom->domain.dev_list);
+
         dma_dom->domain.mode = PAGE_MODE_2_LEVEL;
         dma_dom->domain.pt_root = (void *)get_zeroed_page(GFP_KERNEL);
         dma_dom->domain.flags = PD_DMA_OPS_MASK;
@@ -2916,6 +2914,18 @@ static void protection_domain_free(struct protection_domain *domain)
         kfree(domain);
 }
 
+static int protection_domain_init(struct protection_domain *domain)
+{
+        spin_lock_init(&domain->lock);
+        mutex_init(&domain->api_lock);
+        domain->id = domain_id_alloc();
+        if (!domain->id)
+                return -ENOMEM;
+        INIT_LIST_HEAD(&domain->dev_list);
+
+        return 0;
+}
+
 static struct protection_domain *protection_domain_alloc(void)
 {
         struct protection_domain *domain;
@@ -2924,12 +2934,8 @@ static struct protection_domain *protection_domain_alloc(void)
         if (!domain)
                 return NULL;
 
-        spin_lock_init(&domain->lock);
-        mutex_init(&domain->api_lock);
-        domain->id = domain_id_alloc();
-        if (!domain->id)
+        if (protection_domain_init(domain))
                 goto out_err;
-        INIT_LIST_HEAD(&domain->dev_list);
 
         add_domain_to_list(domain);
 
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index f14130121298..8e9ec81ce4bb 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -1389,8 +1389,7 @@ static void arm_smmu_domain_free(struct iommu_domain *domain)
         struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
         struct arm_smmu_device *smmu = smmu_domain->smmu;
 
-        if (smmu_domain->pgtbl_ops)
-                free_io_pgtable_ops(smmu_domain->pgtbl_ops);
+        free_io_pgtable_ops(smmu_domain->pgtbl_ops);
 
         /* Free the CD and ASID, if we allocated them */
         if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index dce041b1c139..4cd0c29cb585 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1566,7 +1566,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
                 return -ENODEV;
         }
 
-        if ((id & ID0_S1TS) && ((smmu->version == 1) || (id & ID0_ATOSNS))) {
+        if ((id & ID0_S1TS) && ((smmu->version == 1) || !(id & ID0_ATOSNS))) {
                 smmu->features |= ARM_SMMU_FEAT_TRANS_OPS;
                 dev_notice(smmu->dev, "\taddress translation ops\n");
         }
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 49e7542510d1..f286090931cc 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -847,13 +847,24 @@ static int add_iommu_group(struct device *dev, void *data)
 {
         struct iommu_callback_data *cb = data;
         const struct iommu_ops *ops = cb->ops;
+        int ret;
 
         if (!ops->add_device)
                 return 0;
 
         WARN_ON(dev->iommu_group);
 
-        return ops->add_device(dev);
+        ret = ops->add_device(dev);
+
+        /*
+         * We ignore -ENODEV errors for now, as they just mean that the
+         * device is not translated by an IOMMU. We still care about
+         * other errors and fail to initialize when they happen.
+         */
+        if (ret == -ENODEV)
+                ret = 0;
+
+        return ret;
 }
 
 static int remove_iommu_group(struct device *dev, void *data)