shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

BACKPORT: arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm macro

Browse Source 
This patch takes the errata workaround code out of cpu_do_switch_mm into
a dedicated post_ttbr0_update_workaround macro which will be reused in a
subsequent patch.

Cc: Will Deacon <will.deacon@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Kees Cook <keescook@chromium.org>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

Bug: 31432001
Change-Id: I2b45b11ab7390c3545b9e162532109c1526bef14
(cherry picked from commit f33bcf03e6)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
This commit is contained in:
Catalin Marinas
2016-07-01 15:48:55 +01:00
committed by Sami Tolvanen
parent a858462e1f
commit 4fe5f2cb94
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm64/include/asm/assembler.h
View File

@@ -371,4 +371,17 @@ alternative_endif
movk \reg, :abs_g0_nc:\val
.endm
/*
* Errata workaround post TTBR0_EL1 update.
*/
.macro post_ttbr0_update_workaround
#ifdef CONFIG_CAVIUM_ERRATUM_27456
alternative_if ARM64_WORKAROUND_CAVIUM_27456
ic iallu
dsb nsh
isb
alternative_else_nop_endif
#endif
.endm
#endif /* __ASM_ASSEMBLER_H */

11
arch/arm64/mm/proc.S
View File

@@ -136,17 +136,8 @@ ENTRY(cpu_do_switch_mm)
bfi x0, x1, #48, #16 // set the ASID
msr ttbr0_el1, x0 // set TTBR0
isb
alternative_if_not ARM64_WORKAROUND_CAVIUM_27456
post_ttbr0_update_workaround
ret
nop
nop
nop
alternative_else
ic iallu
dsb nsh
isb
ret
alternative_endif
ENDPROC(cpu_do_switch_mm)
.pushsection ".idmap.text", "ax"