Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 455eb7d3 authored by Robin Murphy's avatar Robin Murphy Committed by Will Deacon
Browse files

iommu/arm-smmu: Set domain geometry 



For non-aperture-based IOMMUs, the domain geometry seems to have become
the de-facto way of indicating the input address space size. That is
quite a useful thing from the users' perspective, so let's do the same.

Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Tested-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 021bb842

drivers/iommu/arm-smmu-v3.c

+2 −0
Original line number Diff line number Diff line
@@ -1551,6 +1551,8 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain) 
		return -ENOMEM;



	domain->pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;

	domain->geometry.aperture_end = (1UL << ias) - 1;

	domain->geometry.force_aperture = true;

	smmu_domain->pgtbl_ops = pgtbl_ops;



	ret = finalise_stage_fn(smmu_domain, &pgtbl_cfg);

drivers/iommu/arm-smmu.c

+2 −0
Original line number Diff line number Diff line
@@ -939,6 +939,8 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 


	/* Update the domain's page sizes to reflect the page table format */

	domain->pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;

	domain->geometry.aperture_end = (1UL << ias) - 1;

	domain->geometry.force_aperture = true;



	/* Initialise the context bank with our page table cfg */

	arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);