Commit 05aed941 authored by Will Deacon's avatar Will Deacon
Browse files

iommu/io-pgtable: Hook up ->tlb_flush_walk() and ->tlb_flush_leaf() in drivers 



Hook up ->tlb_flush_walk() and ->tlb_flush_leaf() in drivers using the
io-pgtable API so that we can start making use of them in the page-table
code. For now, they can just wrap the implementations of ->tlb_add_flush
and ->tlb_sync pending future optimisation in each driver.

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

drivers/gpu/drm/panfrost/panfrost_mmu.c

+14 −0
Original line number Diff line number Diff line
@@ -257,8 +257,22 @@ static void mmu_tlb_sync_context(void *cookie) 
	// TODO: Wait 1000 GPU cycles for HW_ISSUE_6367/T60X

}



static void mmu_tlb_flush_walk(unsigned long iova, size_t size, size_t granule,

			       void *cookie)

{

	mmu_tlb_sync_context(cookie);

}



static void mmu_tlb_flush_leaf(unsigned long iova, size_t size, size_t granule,

			       void *cookie)

{

	mmu_tlb_sync_context(cookie);

}



static const struct iommu_flush_ops mmu_tlb_ops = {

	.tlb_flush_all	= mmu_tlb_inv_context_s1,

	.tlb_flush_walk = mmu_tlb_flush_walk,

	.tlb_flush_leaf = mmu_tlb_flush_leaf,

	.tlb_add_flush	= mmu_tlb_inv_range_nosync,

	.tlb_sync	= mmu_tlb_sync_context,

};

drivers/iommu/arm-smmu-v3.c

+22 −0
Original line number Diff line number Diff line
@@ -1603,8 +1603,30 @@ static void arm_smmu_tlb_inv_range_nosync(unsigned long iova, size_t size, 
	} while (size -= granule);

}



static void arm_smmu_tlb_inv_walk(unsigned long iova, size_t size,

				  size_t granule, void *cookie)

{

	struct arm_smmu_domain *smmu_domain = cookie;

	struct arm_smmu_device *smmu = smmu_domain->smmu;



	arm_smmu_tlb_inv_range_nosync(iova, size, granule, false, cookie);

	arm_smmu_cmdq_issue_sync(smmu);

}



static void arm_smmu_tlb_inv_leaf(unsigned long iova, size_t size,

				  size_t granule, void *cookie)

{

	struct arm_smmu_domain *smmu_domain = cookie;

	struct arm_smmu_device *smmu = smmu_domain->smmu;



	arm_smmu_tlb_inv_range_nosync(iova, size, granule, true, cookie);

	arm_smmu_cmdq_issue_sync(smmu);

}



static const struct iommu_flush_ops arm_smmu_flush_ops = {

	.tlb_flush_all	= arm_smmu_tlb_inv_context,

	.tlb_flush_walk = arm_smmu_tlb_inv_walk,

	.tlb_flush_leaf = arm_smmu_tlb_inv_leaf,

	.tlb_add_flush	= arm_smmu_tlb_inv_range_nosync,

	.tlb_sync	= arm_smmu_tlb_sync,

};

drivers/iommu/arm-smmu.c

+24 −0
Original line number Diff line number Diff line
@@ -547,20 +547,44 @@ static void arm_smmu_tlb_inv_vmid_nosync(unsigned long iova, size_t size, 
	writel_relaxed(smmu_domain->cfg.vmid, base + ARM_SMMU_GR0_TLBIVMID);

}



static void arm_smmu_tlb_inv_walk(unsigned long iova, size_t size,

				  size_t granule, void *cookie)

{

	struct arm_smmu_domain *smmu_domain = cookie;



	smmu_domain->tlb_ops->tlb_add_flush(iova, size, granule, false, cookie);

	smmu_domain->tlb_ops->tlb_sync(cookie);

}



static void arm_smmu_tlb_inv_leaf(unsigned long iova, size_t size,

				  size_t granule, void *cookie)

{

	struct arm_smmu_domain *smmu_domain = cookie;



	smmu_domain->tlb_ops->tlb_add_flush(iova, size, granule, true, cookie);

	smmu_domain->tlb_ops->tlb_sync(cookie);

}



static const struct iommu_flush_ops arm_smmu_s1_tlb_ops = {

	.tlb_flush_all	= arm_smmu_tlb_inv_context_s1,

	.tlb_flush_walk	= arm_smmu_tlb_inv_walk,

	.tlb_flush_leaf	= arm_smmu_tlb_inv_leaf,

	.tlb_add_flush	= arm_smmu_tlb_inv_range_nosync,

	.tlb_sync	= arm_smmu_tlb_sync_context,

};



static const struct iommu_flush_ops arm_smmu_s2_tlb_ops_v2 = {

	.tlb_flush_all	= arm_smmu_tlb_inv_context_s2,

	.tlb_flush_walk	= arm_smmu_tlb_inv_walk,

	.tlb_flush_leaf	= arm_smmu_tlb_inv_leaf,

	.tlb_add_flush	= arm_smmu_tlb_inv_range_nosync,

	.tlb_sync	= arm_smmu_tlb_sync_context,

};



static const struct iommu_flush_ops arm_smmu_s2_tlb_ops_v1 = {

	.tlb_flush_all	= arm_smmu_tlb_inv_context_s2,

	.tlb_flush_walk	= arm_smmu_tlb_inv_walk,

	.tlb_flush_leaf	= arm_smmu_tlb_inv_leaf,

	.tlb_add_flush	= arm_smmu_tlb_inv_vmid_nosync,

	.tlb_sync	= arm_smmu_tlb_sync_vmid,

};

drivers/iommu/ipmmu-vmsa.c

+8 −0
Original line number Diff line number Diff line
@@ -361,6 +361,12 @@ static void ipmmu_tlb_flush_all(void *cookie) 
	ipmmu_tlb_invalidate(domain);

}



static void ipmmu_tlb_flush(unsigned long iova, size_t size,

				size_t granule, void *cookie)

{

	ipmmu_tlb_flush_all(cookie);

}



static void ipmmu_tlb_add_flush(unsigned long iova, size_t size,

				size_t granule, bool leaf, void *cookie)

{
@@ -369,6 +375,8 @@ static void ipmmu_tlb_add_flush(unsigned long iova, size_t size, 


static const struct iommu_flush_ops ipmmu_flush_ops = {

	.tlb_flush_all = ipmmu_tlb_flush_all,

	.tlb_flush_walk = ipmmu_tlb_flush,

	.tlb_flush_leaf = ipmmu_tlb_flush,

	.tlb_add_flush = ipmmu_tlb_add_flush,

	.tlb_sync = ipmmu_tlb_flush_all,

};

drivers/iommu/msm_iommu.c

+16 −0
Original line number Diff line number Diff line
@@ -178,8 +178,24 @@ static void __flush_iotlb_sync(void *cookie) 
	 */

}



static void __flush_iotlb_walk(unsigned long iova, size_t size,

			       size_t granule, void *cookie)

{

	__flush_iotlb_range(iova, size, granule, false, cookie);

	__flush_iotlb_sync(cookie);

}



static void __flush_iotlb_leaf(unsigned long iova, size_t size,

			       size_t granule, void *cookie)

{

	__flush_iotlb_range(iova, size, granule, true, cookie);

	__flush_iotlb_sync(cookie);

}



static const struct iommu_flush_ops msm_iommu_flush_ops = {

	.tlb_flush_all = __flush_iotlb,

	.tlb_flush_walk = __flush_iotlb_walk,

	.tlb_flush_leaf = __flush_iotlb_leaf,

	.tlb_add_flush = __flush_iotlb_range,

	.tlb_sync = __flush_iotlb_sync,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE