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

Commit 6549a1ff authored by Robin Murphy's avatar Robin Murphy Committed by Patrick Daly
Browse files

iommu/arm-smmu: Track context bank state 



Echoing what we do for Stream Map Entries, maintain a software shadow
state for context bank configuration. With this in place, we are mere
moments away from blissfully easy suspend/resume support.

Change-Id: Ieb9ee45d31474dbc3f9cb1fa5054f18b1e414a40
Reviewed-by: default avatarSricharan R <sricharan@codeaurora.org>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
[will: fix sparse warning by only clearing .cfg during domain destruction]
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Git-commit: 90df373cc62e527b010025249d11d10d19b086bd
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


[pdaly: Add attributes field. Modify DOMAIN_ATTRIBUTE_EARLY_MAP
handling]
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent f0b0a2a8

drivers/iommu/arm-smmu.c

+108 −71
Original line number Diff line number Diff line
@@ -370,6 +370,14 @@ struct arm_smmu_smr { 
	bool				valid;

};



struct arm_smmu_cb {

	u64				ttbr[2];

	u32				tcr[2];

	u32				mair[2];

	struct arm_smmu_cfg		*cfg;

	u32 				attributes;

};



struct arm_smmu_master_cfg {

	struct arm_smmu_device		*smmu;

	s16				smendx[];
@@ -441,6 +449,7 @@ struct arm_smmu_device { 
	u32				num_s2_context_banks;

	DECLARE_BITMAP(context_map, ARM_SMMU_MAX_CBS);

	DECLARE_BITMAP(secure_context_map, ARM_SMMU_MAX_CBS);

	struct arm_smmu_cb		*cbs;

	atomic_t			irptndx;



	u32				num_mapping_groups;
@@ -1626,17 +1635,76 @@ static int arm_smmu_set_pt_format(struct arm_smmu_domain *smmu_domain, 
static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain,

				       struct io_pgtable_cfg *pgtbl_cfg)

{

	u32 reg, reg2;

	u64 reg64;

	bool stage1;

	struct arm_smmu_cfg *cfg = &smmu_domain->cfg;

	struct arm_smmu_device *smmu = smmu_domain->smmu;

	struct arm_smmu_cb *cb = &smmu_domain->smmu->cbs[cfg->cbndx];

	bool stage1 = cfg->cbar != CBAR_TYPE_S2_TRANS;



	cb->cfg = cfg;



	/* TTBCR */

	if (stage1) {

		if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) {

			cb->tcr[0] = pgtbl_cfg->arm_v7s_cfg.tcr;

		} else {

			cb->tcr[0] = pgtbl_cfg->arm_lpae_s1_cfg.tcr;

			cb->tcr[1] = pgtbl_cfg->arm_lpae_s1_cfg.tcr >> 32;

			cb->tcr[1] |= TTBCR2_SEP_UPSTREAM;

			if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH64)

				cb->tcr[1] |= TTBCR2_AS;

		}

	} else {

		cb->tcr[0] = pgtbl_cfg->arm_lpae_s2_cfg.vtcr;

	}



	/* TTBRs */

	if (stage1) {

		if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) {

			cb->ttbr[0] = pgtbl_cfg->arm_v7s_cfg.ttbr[0];

			cb->ttbr[1] = pgtbl_cfg->arm_v7s_cfg.ttbr[1];

		} else {

			cb->ttbr[0] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[0];

			cb->ttbr[0] |= (u64)cfg->asid << TTBRn_ASID_SHIFT;

			cb->ttbr[1] = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[1];

			cb->ttbr[1] |= (u64)cfg->asid << TTBRn_ASID_SHIFT;

		}

	} else {

		cb->ttbr[0] = pgtbl_cfg->arm_lpae_s2_cfg.vttbr;

	}



	/* MAIRs (stage-1 only) */

	if (stage1) {

		if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) {

			cb->mair[0] = pgtbl_cfg->arm_v7s_cfg.prrr;

			cb->mair[1] = pgtbl_cfg->arm_v7s_cfg.nmrr;

		} else {

			cb->mair[0] = pgtbl_cfg->arm_lpae_s1_cfg.mair[0];

			cb->mair[1] = pgtbl_cfg->arm_lpae_s1_cfg.mair[1];

		}

	}



	cb->attributes = smmu_domain->attributes;

}



static void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx)

{

	u32 reg;

	bool stage1;

	struct arm_smmu_cb *cb = &smmu->cbs[idx];

	struct arm_smmu_cfg *cfg = cb->cfg;

	void __iomem *cb_base, *gr1_base;



	cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, idx);



	/* Unassigned context banks only need disabling */

	if (!cfg) {

		writel_relaxed(0, cb_base + ARM_SMMU_CB_SCTLR);

		return;

	}



	gr1_base = ARM_SMMU_GR1(smmu);

	stage1 = cfg->cbar != CBAR_TYPE_S2_TRANS;

	cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx);



	/* CBA2R */

	if (smmu->version > ARM_SMMU_V1) {

		if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH64)

			reg = CBA2R_RW64_64BIT;
@@ -1646,7 +1714,7 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, 
		if (smmu->features & ARM_SMMU_FEAT_VMID16)

			reg |= ARM_SMMU_CB_VMID(smmu, cfg) << CBA2R_VMID_SHIFT;



		writel_relaxed(reg, gr1_base + ARM_SMMU_GR1_CBA2R(cfg->cbndx));

		writel_relaxed(reg, gr1_base + ARM_SMMU_GR1_CBA2R(idx));

	}



	/* CBAR */
@@ -1665,65 +1733,32 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, 
		/* 8-bit VMIDs live in CBAR */

		reg |= ARM_SMMU_CB_VMID(smmu, cfg) << CBAR_VMID_SHIFT;

	}

	writel_relaxed(reg, gr1_base + ARM_SMMU_GR1_CBAR(cfg->cbndx));

	writel_relaxed(reg, gr1_base + ARM_SMMU_GR1_CBAR(idx));



	/*

	 * TTBCR

	 * We must write this before the TTBRs, since it determines the

	 * access behaviour of some fields (in particular, ASID[15:8]).

	 */

	if (stage1) {

		if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) {

			reg = pgtbl_cfg->arm_v7s_cfg.tcr;

			reg2 = 0;

		} else {

			reg = pgtbl_cfg->arm_lpae_s1_cfg.tcr;

			reg2 = pgtbl_cfg->arm_lpae_s1_cfg.tcr >> 32;

			reg2 |= TTBCR2_SEP_UPSTREAM;

			if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH64)

				reg2 |= TTBCR2_AS;

		}

		if (smmu->version > ARM_SMMU_V1)

			writel_relaxed(reg2, cb_base + ARM_SMMU_CB_TTBCR2);

	} else {

		reg = pgtbl_cfg->arm_lpae_s2_cfg.vtcr;

	}

	writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBCR);

	if (stage1 && smmu->version > ARM_SMMU_V1)

		writel_relaxed(cb->tcr[1], cb_base + ARM_SMMU_CB_TTBCR2);

	writel_relaxed(cb->tcr[0], cb_base + ARM_SMMU_CB_TTBCR);



	/* TTBRs */

	if (stage1) {

		u16 asid = ARM_SMMU_CB_ASID(smmu, cfg);



	if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) {

			reg = pgtbl_cfg->arm_v7s_cfg.ttbr[0];

			writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBR0);

			reg = pgtbl_cfg->arm_v7s_cfg.ttbr[1];

			writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBR1);

			writel_relaxed(asid, cb_base + ARM_SMMU_CB_CONTEXTIDR);

		} else {

			reg64 = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[0];

			reg64 |= (u64)asid << TTBRn_ASID_SHIFT;

			writeq_relaxed(reg64, cb_base + ARM_SMMU_CB_TTBR0);

			reg64 = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[1];

			reg64 |= (u64)asid << TTBRn_ASID_SHIFT;

			writeq_relaxed(reg64, cb_base + ARM_SMMU_CB_TTBR1);

		}

		writel_relaxed(cfg->asid, cb_base + ARM_SMMU_CB_CONTEXTIDR);

		writel_relaxed(cb->ttbr[0], cb_base + ARM_SMMU_CB_TTBR0);

		writel_relaxed(cb->ttbr[1], cb_base + ARM_SMMU_CB_TTBR1);

	} else {

		reg64 = pgtbl_cfg->arm_lpae_s2_cfg.vttbr;

		writeq_relaxed(reg64, cb_base + ARM_SMMU_CB_TTBR0);

		writeq_relaxed(cb->ttbr[0], cb_base + ARM_SMMU_CB_TTBR0);

		if (stage1)

			writeq_relaxed(cb->ttbr[1], cb_base + ARM_SMMU_CB_TTBR1);

	}



	/* MAIRs (stage-1 only) */

	if (stage1) {

		if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) {

			reg = pgtbl_cfg->arm_v7s_cfg.prrr;

			reg2 = pgtbl_cfg->arm_v7s_cfg.nmrr;

		} else {

			reg = pgtbl_cfg->arm_lpae_s1_cfg.mair[0];

			reg2 = pgtbl_cfg->arm_lpae_s1_cfg.mair[1];

		}

		writel_relaxed(reg, cb_base + ARM_SMMU_CB_S1_MAIR0);

		writel_relaxed(reg2, cb_base + ARM_SMMU_CB_S1_MAIR1);

		writel_relaxed(cb->mair[0], cb_base + ARM_SMMU_CB_S1_MAIR0);

		writel_relaxed(cb->mair[1], cb_base + ARM_SMMU_CB_S1_MAIR1);

	}



	/* SCTLR */
@@ -1732,20 +1767,20 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, 
	/* Ensure bypass transactions are Non-shareable */

	reg |= SCTLR_SHCFG_NSH << SCTLR_SHCFG_SHIFT;



	if (smmu_domain->attributes & (1 << DOMAIN_ATTR_CB_STALL_DISABLE)) {

	if (cb->attributes & (1 << DOMAIN_ATTR_CB_STALL_DISABLE)) {

		reg &= ~SCTLR_CFCFG;

		reg |= SCTLR_HUPCF;

	}



	if ((!(smmu_domain->attributes & (1 << DOMAIN_ATTR_S1_BYPASS)) &&

	     !(smmu_domain->attributes & (1 << DOMAIN_ATTR_EARLY_MAP))) ||

	if ((!(cb->attributes & (1 << DOMAIN_ATTR_S1_BYPASS)) &&

	     !(cb->attributes & (1 << DOMAIN_ATTR_EARLY_MAP))) ||

								!stage1)

		reg |= SCTLR_M;

	if (stage1)

		reg |= SCTLR_S1_ASIDPNE;

#ifdef __BIG_ENDIAN

	if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))

		reg |= SCTLR_E;

#endif



	writel_relaxed(reg, cb_base + ARM_SMMU_CB_SCTLR);

}
@@ -1996,6 +2031,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 
		/* Initialise the context bank with our page table cfg */

		arm_smmu_init_context_bank(smmu_domain,

					   &smmu_domain->pgtbl_cfg);

		arm_smmu_write_context_bank(smmu, cfg->cbndx);

		/* for slave side secure, we may have to force the pagetable

		 * format to V8L.

		 */
@@ -2053,7 +2089,6 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain) 
	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

	struct arm_smmu_device *smmu = smmu_domain->smmu;

	struct arm_smmu_cfg *cfg = &smmu_domain->cfg;

	void __iomem *cb_base;

	int irq;

	bool dynamic;

	int ret;
@@ -2085,8 +2120,8 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain) 
	 * Disable the context bank and free the page tables before freeing

	 * it.

	 */

	cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx);

	writel_relaxed(0, cb_base + ARM_SMMU_CB_SCTLR);

	smmu->cbs[cfg->cbndx].cfg = NULL;

	arm_smmu_write_context_bank(smmu, cfg->cbndx);



	if (cfg->irptndx != INVALID_IRPTNDX) {

		irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx];
@@ -3509,19 +3544,16 @@ static int arm_smmu_enable_s1_translations(struct arm_smmu_domain *smmu_domain) 
{

	struct arm_smmu_cfg *cfg = &smmu_domain->cfg;

	struct arm_smmu_device *smmu = smmu_domain->smmu;

	void __iomem *cb_base;

	u32 reg;

	struct arm_smmu_cb *cb = &smmu->cbs[cfg->cbndx];

	int ret;



	cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx);

	ret = arm_smmu_power_on(smmu->pwr);

	if (ret)

		return ret;



	reg = readl_relaxed(cb_base + ARM_SMMU_CB_SCTLR);

	reg |= SCTLR_M;

	cb->attributes &= ~(1 << DOMAIN_ATTR_EARLY_MAP);

	arm_smmu_write_context_bank(smmu, cfg->cbndx);



	writel_relaxed(reg, cb_base + ARM_SMMU_CB_SCTLR);

	arm_smmu_power_off(smmu->pwr);

	return ret;

}
@@ -3784,7 +3816,6 @@ static void arm_smmu_context_bank_reset(struct arm_smmu_device *smmu) 
	int i;

	u32 reg, major;

	void __iomem *gr0_base = ARM_SMMU_GR0(smmu);

	void __iomem *cb_base;



	/*

	 * Before clearing ARM_MMU500_ACTLR_CPRE, need to
@@ -3801,8 +3832,10 @@ static void arm_smmu_context_bank_reset(struct arm_smmu_device *smmu) 


	/* Make sure all context banks are disabled and clear CB_FSR  */

	for (i = 0; i < smmu->num_context_banks; ++i) {

		cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, i);

		writel_relaxed(0, cb_base + ARM_SMMU_CB_SCTLR);

		void __iomem *cb_base = ARM_SMMU_CB_BASE(smmu) +

						ARM_SMMU_CB(smmu, i);



		arm_smmu_write_context_bank(smmu, i);

		writel_relaxed(FSR_FAULT, cb_base + ARM_SMMU_CB_FSR);

		/*

		 * Disable MMU-500's not-particularly-beneficial next-page
@@ -4432,6 +4465,10 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) 
					  &cavium_smmu_context_count);

		smmu->cavium_id_base -= smmu->num_context_banks;

	}

	smmu->cbs = devm_kcalloc(smmu->dev, smmu->num_context_banks,

				 sizeof(*smmu->cbs), GFP_KERNEL);

	if (!smmu->cbs)

		return -ENOMEM;



	/* ID2 */

	id = readl_relaxed(gr0_base + ARM_SMMU_GR0_ID2);