diff options
| author | Mitchel Humpherys | 2014-12-23 18:39:22 +0100 |
|---|---|---|
| committer | Will Deacon | 2015-01-19 15:46:54 +0100 |
| commit | 3c8567d1cac0fa4c44ddcf0a956cae0bf2a348f3 (patch) | |
| tree | 82a63211a7b77fd5ca19d0c1c300fb96603af438 | |
| parent | iommu/arm-smmu: make use of generic LPAE allocator (diff) | |
| download | kernel-qcow2-linux-3c8567d1cac0fa4c44ddcf0a956cae0bf2a348f3.tar.gz kernel-qcow2-linux-3c8567d1cac0fa4c44ddcf0a956cae0bf2a348f3.tar.xz kernel-qcow2-linux-3c8567d1cac0fa4c44ddcf0a956cae0bf2a348f3.zip | |
iommu/arm-smmu: don't touch the secure STLBIALL register
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>
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 919ba433d219..006f006c35e9 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -127,7 +127,6 @@ #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); |