diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-10-06 18:46:22 +0100 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2016-12-05 12:24:04 +0530 |
| commit | 257006efaa35d982aa2076a970047624d81abd68 (patch) | |
| tree | 7eaa4cf81a5098b240010945d9ed6a72952a7726 /arch | |
| parent | 4511bfd29b265519875e2c8f2d94abb84755073c (diff) | |
UPSTREAM: arm64: proc: de-scope TLBI operation during cold boot
When cold-booting a CPU, we must invalidate any junk entries from the
local TLB prior to enabling the MMU. This doesn't require broadcasting
within the inner-shareable domain, so de-scope the operation to apply
only to the local CPU.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Bug: 31432001
Change-Id: Ica3168c51e36070cc55bf023727ad62a21fa1ff3
(cherry picked from commit fa7aae8a4257e6be7051420dac1f150c1eef721b)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/mm/proc.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 4c58844afedf..df8230d6551a 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -161,8 +161,8 @@ ENDPROC(idmap_cpu_replace_ttbr1) * value of the SCTLR_EL1 register. */ ENTRY(__cpu_setup) - tlbi vmalle1is // invalidate I + D TLBs - dsb ish + tlbi vmalle1 // Invalidate local TLB + dsb nsh mov x0, #3 << 20 msr cpacr_el1, x0 // Enable FP/ASIMD |