Commit 5e14313d authored by Michael Shavit's avatar Michael Shavit Committed by Will Deacon
Browse files

iommu/arm-smmu-v3: Cleanup arm_smmu_domain_finalise 



Remove unused master parameter now that the CD table is allocated
elsewhere.

Reviewed-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarMichael Shavit <mshavit@google.com>
Tested-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Link: https://lore.kernel.org/r/20230915211705.v8.7.Iff18df41564b9df82bf40b3ec7af26b87f08ef6e@changeid


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

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+3 −7
Original line number Diff line number Diff line
@@ -2077,7 +2077,6 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) 
}



static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain,

				       struct arm_smmu_master *master,

				       struct io_pgtable_cfg *pgtbl_cfg)

{

	int ret;
@@ -2115,7 +2114,6 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, 
}



static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain,

				       struct arm_smmu_master *master,

				       struct io_pgtable_cfg *pgtbl_cfg)

{

	int vmid;
@@ -2142,8 +2140,7 @@ static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain, 
	return 0;

}



static int arm_smmu_domain_finalise(struct iommu_domain *domain,

				    struct arm_smmu_master *master)

static int arm_smmu_domain_finalise(struct iommu_domain *domain)

{

	int ret;

	unsigned long ias, oas;
@@ -2151,7 +2148,6 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, 
	struct io_pgtable_cfg pgtbl_cfg;

	struct io_pgtable_ops *pgtbl_ops;

	int (*finalise_stage_fn)(struct arm_smmu_domain *,

				 struct arm_smmu_master *,

				 struct io_pgtable_cfg *);

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

	struct arm_smmu_device *smmu = smmu_domain->smmu;
@@ -2203,7 +2199,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, 
	domain->geometry.aperture_end = (1UL << pgtbl_cfg.ias) - 1;

	domain->geometry.force_aperture = true;



	ret = finalise_stage_fn(smmu_domain, master, &pgtbl_cfg);

	ret = finalise_stage_fn(smmu_domain, &pgtbl_cfg);

	if (ret < 0) {

		free_io_pgtable_ops(pgtbl_ops);

		return ret;
@@ -2413,7 +2409,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) 


	if (!smmu_domain->smmu) {

		smmu_domain->smmu = smmu;

		ret = arm_smmu_domain_finalise(domain, master);

		ret = arm_smmu_domain_finalise(domain);

		if (ret)

			smmu_domain->smmu = NULL;

	} else if (smmu_domain->smmu != smmu)