Commit 20143451 authored by Yong Wu's avatar Yong Wu Committed by Will Deacon
Browse files

iommu/mediatek: Add iotlb_sync_map to sync whole the iova range 



Remove IO_PGTABLE_QUIRK_TLBI_ON_MAP to avoid tlb sync for each a small
chunk memory, Use the new iotlb_sync_map to tlb_sync once for whole the
iova range of iommu_map.

Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210107122909.16317-4-yong.wu@mediatek.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 2ebbd258

drivers/iommu/mtk_iommu.c

+9 −1
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom) 
	dom->cfg = (struct io_pgtable_cfg) {

		.quirks = IO_PGTABLE_QUIRK_ARM_NS |

			IO_PGTABLE_QUIRK_NO_PERMS |

			IO_PGTABLE_QUIRK_TLBI_ON_MAP |

			IO_PGTABLE_QUIRK_ARM_MTK_EXT,

		.pgsize_bitmap = mtk_iommu_ops.pgsize_bitmap,

		.ias = 32,
@@ -453,6 +452,14 @@ static void mtk_iommu_iotlb_sync(struct iommu_domain *domain, 
				       data);

}



static void mtk_iommu_sync_map(struct iommu_domain *domain, unsigned long iova,

			       size_t size)

{

	struct mtk_iommu_data *data = mtk_iommu_get_m4u_data();



	mtk_iommu_tlb_flush_range_sync(iova, size, size, data);

}



static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,

					  dma_addr_t iova)

{
@@ -539,6 +546,7 @@ static const struct iommu_ops mtk_iommu_ops = { 
	.unmap		= mtk_iommu_unmap,

	.flush_iotlb_all = mtk_iommu_flush_iotlb_all,

	.iotlb_sync	= mtk_iommu_iotlb_sync,

	.iotlb_sync_map	= mtk_iommu_sync_map,

	.iova_to_phys	= mtk_iommu_iova_to_phys,

	.probe_device	= mtk_iommu_probe_device,

	.release_device	= mtk_iommu_release_device,