iommu/sunxi: define protection flag IOMMU_SUNXI_NO_ZAP_TLB

scpcom · Dec 12, 2021 · 8bd1945 · 8bd1945
1 parent 4acf05d
commit 8bd1945
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
@@ -2009,7 +2009,7 @@ size_t iommu_map_sg(struct iommu_domain *domain, unsigned long iova,
 #ifdef CONFIG_ARCH_SUNXI
 	struct iommu_iotlb_gather iotlb_gather;
 
-	prot |= (1 << 16);
+	prot |= IOMMU_SUNXI_NO_ZAP_TLB;
 #endif
 	while (i <= nents) {
 		phys_addr_t s_phys = sg_phys(sg);

diff --git a/drivers/iommu/sunxi-iommu.c b/drivers/iommu/sunxi-iommu.c
@@ -502,7 +502,7 @@ static int sunxi_iommu_map(struct iommu_domain *domain, unsigned long iova,
 	dma_sync_single_for_device(dma_dev, virt_to_phys(iopte_offset(dent, s_iova_start)),
 			flush_count << 2, DMA_TO_DEVICE);
 out:
-	if (!(prot & (1 << 16)))
+	if (!(prot & IOMMU_SUNXI_NO_ZAP_TLB))
 		sunxi_zap_tlb(iova, size);
 	mutex_unlock(&sunxi_domain->dt_lock);
 

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
@@ -36,6 +36,12 @@
  * last level cache, aka system cache.
  */
 #define IOMMU_QCOM_SYS_CACHE	(1 << 6)
+#ifdef CONFIG_ARCH_SUNXI
+/*
+ * Do not call sunxi_zap_tlb on map if this flag is set.
+*/
+#define IOMMU_SUNXI_NO_ZAP_TLB	(1 << 16)
+#endif
 
 struct iommu_ops;
 struct iommu_group;