diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2016-07-01 14:48:55 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-05-27 03:16:36 (GMT) |
| commit | f261e527ebcf667f7d41b8831de43c099bac6c0e (patch) | |
| tree | 62eccbeefe4e4497c996b7891f7fe0e1e29e3864 /arch/arm64/include | |
| parent | 551360dfb9ca44bb7aaa74fc6f40b545f96c41e2 (diff) | |
| download | linux-f261e527ebcf667f7d41b8831de43c099bac6c0e.tar.xz | |
arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm macro
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>
(cherry picked from commit f33bcf03e6079668da6bf4eec4a7dcf9289131d0)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/assembler.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 128a9ca..5575223 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -406,4 +406,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 */ |