commit e31de867a2fd87d170040c48e7bb7c5d1e1161ae
author Manish V Badarkhe <manish.badarkhe@arm.com> Fri Apr 28 12:08:37 2023 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Fri Apr 28 12:08:37 2023 +0200
tree 684383f203e2b09e78aaebb0d17f7f51ebe22b2f
parent a49bb6f838a7c79a7eef5e286213c8f772a51187
parent 7d5036b8ec911d83ede6eb73f1693b6f160d90ed

Merge "fix(ras): do not put RAS check before esb macro" into integration

include/arch/aarch64/asm_macros.S

diff --git a/include/arch/aarch64/asm_macros.S b/include/arch/aarch64/asm_macros.S
index b4dab085..7d1407a 100644
--- a/include/arch/aarch64/asm_macros.S
+++ b/include/arch/aarch64/asm_macros.S
@@ -186,11 +186,12 @@
 	.space	SPINLOCK_ASM_SIZE
 	.endm
 
-#if RAS_EXTENSION
+	/*
+	 * With RAS extension executes esb instruction, else NOP
+	 */
 	.macro esb
 	.inst	0xd503221f
 	.endm
-#endif
 
 	/*
 	 * Helper macro to read system register value into x0