andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Mark Dykes 2020-03-12 14:32:13 +00:00 committed by TrustedFirmware Code Review
parent 765cac8db4 ccfb5c8134
commit 8fd41bb973
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/arch/aarch32/asm_macros.S
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

7
include/arch/aarch64/asm_macros.S
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 */