Merge "iommu: msm: ensure lazy mappings are unmapped on detach"

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm64/mm/dma-mapping.c
Simple merge

diff --cc drivers/iommu/msm_dma_iommu_mapping.c
index e26b799,0377f08..a035ebd
--- 1/drivers/iommu/msm_dma_iommu_mapping.c
--- 2/drivers/iommu/msm_dma_iommu_mapping.c
+++ b/drivers/iommu/msm_dma_iommu_mapping.c
@@@ -344,8 -343,36 +344,37 @@@ void msm_dma_unmap_sg(struct device *de
  out:
        return;
  }
 +EXPORT_SYMBOL(msm_dma_unmap_sg);
  
+ int msm_dma_unmap_all_for_dev(struct device *dev)
+ {
+       int ret = 0;
+       struct msm_iommu_meta *meta;
+       struct rb_root *root;
+       struct rb_node *meta_node;
+ 
+       mutex_lock(&msm_iommu_map_mutex);
+       root = &iommu_root;
+       meta_node = rb_first(root);
+       while (meta_node) {
+               struct msm_iommu_map *iommu_map;
+ 
+               meta = rb_entry(meta_node, struct msm_iommu_meta, node);
+               mutex_lock(&meta->lock);
+               list_for_each_entry(iommu_map, &meta->iommu_maps, lnode)
+                       if (iommu_map->dev == dev)
+                               if (!kref_put(&iommu_map->ref,
+                                               msm_iommu_map_release))
+                                       ret = -EINVAL;
+ 
+               mutex_unlock(&meta->lock);
+               meta_node = rb_next(meta_node);
+       }
+       mutex_unlock(&msm_iommu_map_mutex);
+ 
+       return ret;
+ }
+ 
  /*
   * Only to be called by ION code when a buffer is freed
   */