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

Commit 659db6f6 authored by Andreas Herrmann's avatar Andreas Herrmann Committed by Will Deacon
Browse files

iommu/arm-smmu: Clear global and context bank fault status registers 



After reset these registers have unknown values.
This might cause problems when evaluating SMMU_GFSR and/or SMMU_CB_FSR
in handlers for combined interrupts.

Signed-off-by: default avatarAndreas Herrmann <andreas.herrmann@calxeda.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 2ef0f031

drivers/iommu/arm-smmu.c

+20 −11
Original line number Diff line number Diff line
@@ -1562,9 +1562,13 @@ static struct iommu_ops arm_smmu_ops = { 
static void arm_smmu_device_reset(struct arm_smmu_device *smmu)

{

	void __iomem *gr0_base = ARM_SMMU_GR0(smmu);

	void __iomem *sctlr_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB_SCTLR;

	void __iomem *cb_base;

	int i = 0;

	u32 scr0 = readl_relaxed(gr0_base + ARM_SMMU_GR0_sCR0);

	u32 reg;



	/* Clear Global FSR */

	reg = readl_relaxed(gr0_base + ARM_SMMU_GR0_sGFSR);

	writel(reg, gr0_base + ARM_SMMU_GR0_sGFSR);



	/* Mark all SMRn as invalid and all S2CRn as bypass */

	for (i = 0; i < smmu->num_mapping_groups; ++i) {
@@ -1572,33 +1576,38 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu) 
		writel_relaxed(S2CR_TYPE_BYPASS, gr0_base + ARM_SMMU_GR0_S2CR(i));

	}



	/* Make sure all context banks are disabled */

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

		writel_relaxed(0, sctlr_base + ARM_SMMU_CB(smmu, i));

	/* 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);

		writel_relaxed(FSR_FAULT, cb_base + ARM_SMMU_CB_FSR);

	}



	/* Invalidate the TLB, just in case */

	writel_relaxed(0, gr0_base + ARM_SMMU_GR0_STLBIALL);

	writel_relaxed(0, gr0_base + ARM_SMMU_GR0_TLBIALLH);

	writel_relaxed(0, gr0_base + ARM_SMMU_GR0_TLBIALLNSNH);



	reg = readl_relaxed(gr0_base + ARM_SMMU_GR0_sCR0);



	/* Enable fault reporting */

	scr0 |= (sCR0_GFRE | sCR0_GFIE | sCR0_GCFGFRE | sCR0_GCFGFIE);

	reg |= (sCR0_GFRE | sCR0_GFIE | sCR0_GCFGFRE | sCR0_GCFGFIE);



	/* Disable TLB broadcasting. */

	scr0 |= (sCR0_VMIDPNE | sCR0_PTM);

	reg |= (sCR0_VMIDPNE | sCR0_PTM);



	/* Enable client access, but bypass when no mapping is found */

	scr0 &= ~(sCR0_CLIENTPD | sCR0_USFCFG);

	reg &= ~(sCR0_CLIENTPD | sCR0_USFCFG);



	/* Disable forced broadcasting */

	scr0 &= ~sCR0_FB;

	reg &= ~sCR0_FB;



	/* Don't upgrade barriers */

	scr0 &= ~(sCR0_BSU_MASK << sCR0_BSU_SHIFT);

	reg &= ~(sCR0_BSU_MASK << sCR0_BSU_SHIFT);



	/* Push the button */

	arm_smmu_tlb_sync(smmu);

	writel_relaxed(scr0, gr0_base + ARM_SMMU_GR0_sCR0);

	writel_relaxed(reg, gr0_base + ARM_SMMU_GR0_sCR0);

}



static int arm_smmu_id_size_to_bits(int size)