Merge "Use Speculation Barrier instruction for v8.5 cores" into integration
This commit is contained in:
commit
8fd41bb973
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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 */
|
||||||
|
|
Loading…
Reference in New Issue