Use Speculation Barrier instruction for v8.5 cores

Change-Id: Ie1018bfbae2fe95c699e58648665baa75e862000
Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>
This commit is contained in:
Madhukar Pappireddy 2020-03-10 18:04:59 -05:00
parent f09852c97b
commit ccfb5c8134
2 changed files with 11 additions and 1 deletions

View File

@ -108,11 +108,16 @@
#else
/*
* Macro for mitigating against speculative execution beyond ERET.
* If possible use Speculation Barrier instruction defined in ARMv8.5
*/
.macro exception_return
eret
#if ARM_ARCH_AT_LEAST(8, 5)
sb
#else
dsb nsh
isb
#endif
.endm
#endif

View File

@ -220,11 +220,16 @@
/*
* Macro for mitigating against speculative execution beyond ERET.
* If possible use Speculation Barrier instruction defined in ARMv8.5
*/
.macro exception_return
eret
dsb nsh
#if ARM_ARCH_AT_LEAST(8, 5)
sb
#else
dsb nsh
isb
#endif
.endm
#endif /* ASM_MACROS_S */