Revert "FROMLIST: arm64: Factor out TTBR0_EL1 post-update workaround into a specific...

This reverts commit 3b66929169de053042d47e482dd5748794756153.

Bug: 31432001
Change-Id: Ib38fcf553ca2077531cbf550fbaa75378a8723c5
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>

diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index 9d3e77a5cf07546fbd024c2f21615ea4a20f0880..9e8ac1e73457f4ec8e92deacec7bb48f14e91331 100644 (file)
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -362,21 +362,4 @@ 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_not ARM64_WORKAROUND_CAVIUM_27456
-       nop
-       nop
-       nop
-alternative_else
-       ic      iallu
-       dsb     nsh
-       isb
-alternative_endif
-#endif
-       .endm
-
 #endif /* __ASM_ASSEMBLER_H */

diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index 8292784d44c95508c50be40b201454fafc488d2e..5bb61de2320172c806ee58959e3f721b2b243a99 100644 (file)
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -125,8 +125,17 @@ ENTRY(cpu_do_switch_mm)
        bfi     x0, x1, #48, #16                // set the ASID
        msr     ttbr0_el1, x0                   // set TTBR0
        isb
-       post_ttbr0_update_workaround
+alternative_if_not ARM64_WORKAROUND_CAVIUM_27456
        ret
+       nop
+       nop
+       nop
+alternative_else
+       ic      iallu
+       dsb     nsh
+       isb
+       ret
+alternative_endif
 ENDPROC(cpu_do_switch_mm)
 
        .pushsection ".idmap.text", "ax"