aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorOlivier Deprez <olivier.deprez@arm.com>2021-04-12 15:37:14 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-04-12 15:37:14 +0200
commit9fa849d36ea4b8e62bbca8250709c4509b64960c (patch)
tree0da2e2ac40b854145cbc0d00c47510a6b8a821b9 /include
parent160bfb278ed63956bd0b303526b1a7787ee823b5 (diff)
parent4e04478aace24232d9acb9ca7c71af8ae845811f (diff)
downloadtrusted-firmware-a-9fa849d36ea4b8e62bbca8250709c4509b64960c.tar.gz
Merge "arch: Enable `FEAT_SB` for supported non-Armv8.5-A platforms" into integration
Diffstat (limited to 'include')
-rw-r--r--include/arch/aarch32/asm_macros.S6
-rw-r--r--include/arch/aarch64/asm_macros.S6
2 files changed, 6 insertions, 6 deletions
diff --git a/include/arch/aarch32/asm_macros.S b/include/arch/aarch32/asm_macros.S
index f75da0ce62..483f9fe056 100644
--- a/include/arch/aarch32/asm_macros.S
+++ b/include/arch/aarch32/asm_macros.S
@@ -107,12 +107,12 @@
#else
/*
- * Macro for mitigating against speculative execution beyond ERET.
- * If possible use Speculation Barrier instruction defined in ARMv8.5
+ * Macro for mitigating against speculative execution beyond ERET. Uses the
+ * speculation barrier instruction introduced by FEAT_SB, if it's enabled.
*/
.macro exception_return
eret
-#if ARM_ARCH_AT_LEAST(8, 5)
+#if ENABLE_FEAT_SB
sb
#else
dsb nsh
diff --git a/include/arch/aarch64/asm_macros.S b/include/arch/aarch64/asm_macros.S
index cbb9f0be8f..464c05be1a 100644
--- a/include/arch/aarch64/asm_macros.S
+++ b/include/arch/aarch64/asm_macros.S
@@ -219,12 +219,12 @@
.endm
/*
- * Macro for mitigating against speculative execution beyond ERET.
- * If possible use Speculation Barrier instruction defined in ARMv8.5
+ * Macro for mitigating against speculative execution beyond ERET. Uses the
+ * speculation barrier instruction introduced by FEAT_SB, if it's enabled.
*/
.macro exception_return
eret
-#if ARM_ARCH_AT_LEAST(8, 5)
+#if ENABLE_FEAT_SB
sb
#else
dsb nsh