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

[karo-tx-linux.git] / drivers / iommu / arm-smmu.c

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index f21332a1504022458d520f865e578d4b6524ccbc..2409e3bd3df21e973db1231360b7a50fba66efa1 100644 (file)
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1094,6 +1094,13 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain,
        if (ret)
                return ret == -EEXIST ? 0 : ret;
 
+       /*
+        * FIXME: This won't be needed once we have IOMMU-backed DMA ops
+        * for all devices behind the SMMU.
+        */
+       if (smmu_domain->domain.type == IOMMU_DOMAIN_DMA)
+               return 0;
+
        for (i = 0; i < cfg->num_streamids; ++i) {
                u32 idx, s2cr;