diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-03-12 14:32:13 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-03-12 14:32:13 +0000 |
| commit | 8fd41bb973c472d188f7030d4a742ac514bff10e (patch) | |
| tree | 7bde21b3288d2e5220d1d133145776021d3e4bff /include/arch | |
| parent | 765cac8db40815f8c50003c54f32b9a7ef5d08b9 (diff) | |
| parent | ccfb5c81349c3a10ac78741e598e80e416a811c3 (diff) | |
| download | arm-trusted-firmware-8fd41bb973c472d188f7030d4a742ac514bff10e.tar.gz | |
Merge "Use Speculation Barrier instruction for v8.5 cores" into integration
Diffstat (limited to 'include/arch')
| -rw-r--r-- | include/arch/aarch32/asm_macros.S | 5 | ||||
| -rw-r--r-- | include/arch/aarch64/asm_macros.S | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/arch/aarch32/asm_macros.S b/include/arch/aarch32/asm_macros.S index ea1636e24..f75da0ce6 100644 --- a/include/arch/aarch32/asm_macros.S +++ b/include/arch/aarch32/asm_macros.S @@ -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 diff --git a/include/arch/aarch64/asm_macros.S b/include/arch/aarch64/asm_macros.S index a7d5a3dd6..cbb9f0be8 100644 --- a/include/arch/aarch64/asm_macros.S +++ b/include/arch/aarch64/asm_macros.S @@ -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 */ |