Commit dd147a89 authored by Jordan Crouse's avatar Jordan Crouse Committed by Will Deacon
Browse files

iommu/arm-smmu: Pass io-pgtable config to implementation specific function 



Construct the io-pgtable config before calling the implementation specific
init_context function and pass it so the implementation specific function
can get a chance to change it before the io-pgtable is created.

Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 376cdf66

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

+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ static int cavium_cfg_probe(struct arm_smmu_device *smmu) 
	return 0;

}



static int cavium_init_context(struct arm_smmu_domain *smmu_domain)

static int cavium_init_context(struct arm_smmu_domain *smmu_domain,

		struct io_pgtable_cfg *pgtbl_cfg)

{

	struct cavium_smmu *cs = container_of(smmu_domain->smmu,

					      struct cavium_smmu, smmu);

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

+6 −5
Original line number Diff line number Diff line
@@ -795,11 +795,6 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 
		cfg->asid = cfg->cbndx;



	smmu_domain->smmu = smmu;

	if (smmu->impl && smmu->impl->init_context) {

		ret = smmu->impl->init_context(smmu_domain);

		if (ret)

			goto out_unlock;

	}



	pgtbl_cfg = (struct io_pgtable_cfg) {

		.pgsize_bitmap	= smmu->pgsize_bitmap,
@@ -810,6 +805,12 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 
		.iommu_dev	= smmu->dev,

	};



	if (smmu->impl && smmu->impl->init_context) {

		ret = smmu->impl->init_context(smmu_domain, &pgtbl_cfg);

		if (ret)

			goto out_clear_smmu;

	}



	if (smmu_domain->non_strict)

		pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT;

drivers/iommu/arm/arm-smmu/arm-smmu.h

+2 −1
Original line number Diff line number Diff line
@@ -386,7 +386,8 @@ struct arm_smmu_impl { 
			    u64 val);

	int (*cfg_probe)(struct arm_smmu_device *smmu);

	int (*reset)(struct arm_smmu_device *smmu);

	int (*init_context)(struct arm_smmu_domain *smmu_domain);

	int (*init_context)(struct arm_smmu_domain *smmu_domain,

			struct io_pgtable_cfg *cfg);

	void (*tlb_sync)(struct arm_smmu_device *smmu, int page, int sync,

			 int status);

	int (*def_domain_type)(struct device *dev);