iommu/arm-smmu: don't touch the secure STLBIALL register
authorMitchel Humpherys <mitchelh@codeaurora.org>
Tue, 23 Dec 2014 17:39:22 +0000 (17:39 +0000)
committerWill Deacon <will.deacon@arm.com>
Mon, 19 Jan 2015 14:46:54 +0000 (14:46 +0000)
Currently we do a STLBIALL when we initialize the SMMU.  However, in
some configurations that register is not supposed to be touched and is
marked as "Secure only" in the spec.  Rip it out.

Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
drivers/iommu/arm-smmu.c

index 919ba43..006f006 100644 (file)
 #define ID2_PTFS_64K                   (1 << 14)
 
 /* Global TLB invalidation */
-#define ARM_SMMU_GR0_STLBIALL          0x60
 #define ARM_SMMU_GR0_TLBIVMID          0x64
 #define ARM_SMMU_GR0_TLBIALLNSNH       0x68
 #define ARM_SMMU_GR0_TLBIALLH          0x6c
@@ -1414,7 +1413,6 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu)
        }
 
        /* 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);