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

Pull IOMMU fixes from Joerg Roedel:

 - compile-time fixes (warnings and failures)

 - a bug in iommu core code which could cause the group->domain pointer
   to be falsly cleared

 - fix in scatterlist handling of the ARM common DMA-API code

 - stall detection fix for the Rockchip IOMMU driver

* tag 'iommu-fixes-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/vt-d: Silence an uninitialized variable warning
  iommu/rockchip: Fix "is stall active" check
  iommu: Don't overwrite domain pointer when there is no default_domain
  iommu/dma: Restore scatterlist offsets correctly
  iommu: provide of_xlate pointer unconditionally

5 files changed, 9 insertions, 10 deletions

diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 72d6182666cb..58f2fe687a24 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -403,7 +403,7 @@ static int __finalise_sg(struct device *dev, struct scatterlist *sg, int nents,
                 unsigned int s_length = sg_dma_len(s);
                 unsigned int s_dma_len = s->length;
 
-                s->offset = s_offset;
+                s->offset += s_offset;
                 s->length = s_length;
                 sg_dma_address(s) = dma_addr + s_offset;
                 dma_addr += s_dma_len;
@@ -422,7 +422,7 @@ static void __invalidate_sg(struct scatterlist *sg, int nents)
 
         for_each_sg(sg, s, nents, i) {
                 if (sg_dma_address(s) != DMA_ERROR_CODE)
-                        s->offset = sg_dma_address(s);
+                        s->offset += sg_dma_address(s);
                 if (sg_dma_len(s))
                         s->length = sg_dma_len(s);
                 sg_dma_address(s) = DMA_ERROR_CODE;
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index a2e1b7f14df2..e1852e845d21 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2458,7 +2458,7 @@ static struct dmar_domain *get_domain_for_dev(struct device *dev, int gaw)
         }
 
         /* register PCI DMA alias device */
-        if (req_id != dma_alias && dev_is_pci(dev)) {
+        if (dev_is_pci(dev) && req_id != dma_alias) {
                 tmp = dmar_insert_one_dev_info(iommu, PCI_BUS_NUM(dma_alias),
                                                dma_alias & 0xff, NULL, domain);
 
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index bfd4f7c3b1d8..b9df1411c894 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -848,7 +848,8 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev)
         if (!group->default_domain) {
                 group->default_domain = __iommu_domain_alloc(dev->bus,
                                                              IOMMU_DOMAIN_DMA);
-                group->domain = group->default_domain;
+                if (!group->domain)
+                        group->domain = group->default_domain;
         }
 
         ret = iommu_group_add_device(group, dev);
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index a6f593a0a29e..5710a06c3049 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -315,8 +315,8 @@ static bool rk_iommu_is_stall_active(struct rk_iommu *iommu)
         int i;
 
         for (i = 0; i < iommu->num_mmu; i++)
-                active &= rk_iommu_read(iommu->bases[i], RK_MMU_STATUS) &
-                                        RK_MMU_STATUS_STALL_ACTIVE;
+                active &= !!(rk_iommu_read(iommu->bases[i], RK_MMU_STATUS) &
+                                           RK_MMU_STATUS_STALL_ACTIVE);
 
         return active;
 }
@@ -327,8 +327,8 @@ static bool rk_iommu_is_paging_enabled(struct rk_iommu *iommu)
         int i;
 
         for (i = 0; i < iommu->num_mmu; i++)
-                enable &= rk_iommu_read(iommu->bases[i], RK_MMU_STATUS) &
-                                        RK_MMU_STATUS_PAGING_ENABLED;
+                enable &= !!(rk_iommu_read(iommu->bases[i], RK_MMU_STATUS) &
+                                           RK_MMU_STATUS_PAGING_ENABLED);
 
         return enable;
 }
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index a5c539fa5d2b..ef7a6ecd8584 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -195,9 +195,7 @@ struct iommu_ops {
         /* Get the number of windows per domain */
         u32 (*domain_get_windows)(struct iommu_domain *domain);
 
-#ifdef CONFIG_OF_IOMMU
         int (*of_xlate)(struct device *dev, struct of_phandle_args *args);
-#endif
 
         unsigned long pgsize_bitmap;
         void *priv;