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

Commit 39e9c91a authored by Mitchel Humpherys's avatar Mitchel Humpherys Committed by Patrick Daly
Browse files

iommu/arm-smmu: save the pgtbl_cfg in the domain 



The pgtbl_cfg object has a few handy properties that we'd like to make
use of later (returning the pgd in a domain attribute, for example).
Keep track of the domain pgtbl_cfg in the domain structure.

Change-Id: Icce9638a270ca98d6ed6d61b3ef1c35d42a869dc
Signed-off-by: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent 19f19d54

drivers/iommu/arm-smmu.c

+6 −5
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ enum arm_smmu_domain_stage { 
struct arm_smmu_domain {

	struct arm_smmu_device		*smmu;

	struct io_pgtable_ops		*pgtbl_ops;

	struct io_pgtable_cfg		pgtbl_cfg;

	spinlock_t			pgtbl_lock;

	struct arm_smmu_cfg		cfg;

	enum arm_smmu_domain_stage	stage;
@@ -1025,7 +1026,6 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 
	int irq, start, ret = 0;

	unsigned long ias, oas;

	struct io_pgtable_ops *pgtbl_ops;

	struct io_pgtable_cfg pgtbl_cfg;

	enum io_pgtable_fmt fmt;

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

	struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
@@ -1134,7 +1134,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 
		cfg->irptndx = cfg->cbndx;

	}



	pgtbl_cfg = (struct io_pgtable_cfg) {

	smmu_domain->pgtbl_cfg = (struct io_pgtable_cfg) {

		.pgsize_bitmap	= smmu->pgsize_bitmap,

		.ias		= ias,

		.oas		= oas,
@@ -1143,17 +1143,18 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 
	};



	smmu_domain->smmu = smmu;

	pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);

	pgtbl_ops = alloc_io_pgtable_ops(fmt, &smmu_domain->pgtbl_cfg,

					smmu_domain);

	if (!pgtbl_ops) {

		ret = -ENOMEM;

		goto out_clear_smmu;

	}



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

	domain->pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;

	domain->pgsize_bitmap = smmu_domain->pgtbl_cfg.pgsize_bitmap;



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

	arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);

	arm_smmu_init_context_bank(smmu_domain, &smmu_domain->pgtbl_cfg);



	/*

	 * Request context fault interrupt. Do this last to avoid the