Commit 298f7889 authored by Will Deacon's avatar Will Deacon
Browse files

iommu/io-pgtable: Rename iommu_gather_ops to iommu_flush_ops 



In preparation for TLB flush gathering in the IOMMU API, rename the
iommu_gather_ops structure in io-pgtable to iommu_flush_ops, which
better describes its purpose and avoids the potential for confusion
between different levels of the API.

$ find linux/ -type f -name '*.[ch]' | xargs sed -i 's/gather_ops/flush_ops/g'

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

drivers/gpu/drm/panfrost/panfrost_mmu.c

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

}



static const struct iommu_gather_ops mmu_tlb_ops = {

static const struct iommu_flush_ops mmu_tlb_ops = {

	.tlb_flush_all	= mmu_tlb_inv_context_s1,

	.tlb_add_flush	= mmu_tlb_inv_range_nosync,

	.tlb_sync	= mmu_tlb_sync_context,

drivers/iommu/arm-smmu-v3.c

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

}



static const struct iommu_gather_ops arm_smmu_gather_ops = {

static const struct iommu_flush_ops arm_smmu_flush_ops = {

	.tlb_flush_all	= arm_smmu_tlb_inv_context,

	.tlb_add_flush	= arm_smmu_tlb_inv_range_nosync,

	.tlb_sync	= arm_smmu_tlb_sync,
@@ -1796,7 +1796,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain) 
		.ias		= ias,

		.oas		= oas,

		.coherent_walk	= smmu->features & ARM_SMMU_FEAT_COHERENCY,

		.tlb		= &arm_smmu_gather_ops,

		.tlb		= &arm_smmu_flush_ops,

		.iommu_dev	= smmu->dev,

	};

drivers/iommu/arm-smmu.c

+4 −4
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ enum arm_smmu_domain_stage { 
struct arm_smmu_domain {

	struct arm_smmu_device		*smmu;

	struct io_pgtable_ops		*pgtbl_ops;

	const struct iommu_gather_ops	*tlb_ops;

	const struct iommu_flush_ops	*tlb_ops;

	struct arm_smmu_cfg		cfg;

	enum arm_smmu_domain_stage	stage;

	bool				non_strict;
@@ -547,19 +547,19 @@ 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 const struct iommu_gather_ops arm_smmu_s1_tlb_ops = {

static const struct iommu_flush_ops arm_smmu_s1_tlb_ops = {

	.tlb_flush_all	= arm_smmu_tlb_inv_context_s1,

	.tlb_add_flush	= arm_smmu_tlb_inv_range_nosync,

	.tlb_sync	= arm_smmu_tlb_sync_context,

};



static const struct iommu_gather_ops arm_smmu_s2_tlb_ops_v2 = {

static const struct iommu_flush_ops arm_smmu_s2_tlb_ops_v2 = {

	.tlb_flush_all	= arm_smmu_tlb_inv_context_s2,

	.tlb_add_flush	= arm_smmu_tlb_inv_range_nosync,

	.tlb_sync	= arm_smmu_tlb_sync_context,

};



static const struct iommu_gather_ops arm_smmu_s2_tlb_ops_v1 = {

static const struct iommu_flush_ops arm_smmu_s2_tlb_ops_v1 = {

	.tlb_flush_all	= arm_smmu_tlb_inv_context_s2,

	.tlb_add_flush	= arm_smmu_tlb_inv_vmid_nosync,

	.tlb_sync	= arm_smmu_tlb_sync_vmid,

drivers/iommu/io-pgtable-arm-v7s.c

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ static void dummy_tlb_sync(void *cookie) 
	WARN_ON(cookie != cfg_cookie);

}



static const struct iommu_gather_ops dummy_tlb_ops = {

static const struct iommu_flush_ops dummy_tlb_ops = {

	.tlb_flush_all	= dummy_tlb_flush_all,

	.tlb_add_flush	= dummy_tlb_add_flush,

	.tlb_sync	= dummy_tlb_sync,

drivers/iommu/io-pgtable-arm.c

+1 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ static void dummy_tlb_sync(void *cookie) 
	WARN_ON(cookie != cfg_cookie);

}



static const struct iommu_gather_ops dummy_tlb_ops __initconst = {

static const struct iommu_flush_ops dummy_tlb_ops __initconst = {

	.tlb_flush_all	= dummy_tlb_flush_all,

	.tlb_add_flush	= dummy_tlb_add_flush,

	.tlb_sync	= dummy_tlb_sync,

CRA Git | Maintained and supported by SUSTech CRA and CCSE