Skip to content

GitLab

Commit 8fd41bb9 authored by Mark Dykes's avatar Mark Dykes Committed by TrustedFirmware Code Review
Browse files

Merge "Use Speculation Barrier instruction for v8.5 cores" into integration

parents 765cac8d ccfb5c81
Hide whitespace changes
Inline Side-by-side
include/arch/aarch32/asm_macros.S
View file @ 8fd41bb9
...@@ -108,11 +108,16 @@ ...@@ -108,11 +108,16 @@
#else #else
/* /*
* Macro for mitigating against speculative execution beyond ERET. * Macro for mitigating against speculative execution beyond ERET.
* If possible use Speculation Barrier instruction defined in ARMv8.5
*/ */
.macro exception_return .macro exception_return
eret eret
#if ARM_ARCH_AT_LEAST(8, 5)
sb
#else
dsb nsh dsb nsh
isb isb
#endif
.endm .endm
#endif #endif
......
include/arch/aarch64/asm_macros.S
View file @ 8fd41bb9
...@@ -220,11 +220,16 @@ ...@@ -220,11 +220,16 @@
/* /*
* Macro for mitigating against speculative execution beyond ERET. * Macro for mitigating against speculative execution beyond ERET.
* If possible use Speculation Barrier instruction defined in ARMv8.5
*/ */
.macro exception_return .macro exception_return
eret eret
dsb nsh #if ARM_ARCH_AT_LEAST(8, 5)
sb
#else
dsb nsh
isb isb
#endif
.endm .endm
#endif /* ASM_MACROS_S */ #endif /* ASM_MACROS_S */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment