From: Manish Pandey Date: Thu, 27 Apr 2023 09:02:35 +0000 (+0100) Subject: fix(ras): do not put RAS check before esb macro X-Git-Tag: baikal/aarch64/sdk5.10~1^2~53^2 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=7d5036b8ec911d83ede6eb73f1693b6f160d90ed;p=arm-tf.git fix(ras): do not put RAS check before esb macro Macro esb used in TF-A executes the instruction "esb" and is kept under RAS_EXTENSION macro. RAS_EXTENSION, as it stands today, is only enabled for platforms which wants RAS errors to be handled in Firmware while esb instruction is available when RAS architecture feature is present irrespective of its handling. Currently TF-A does not have mechanism to detect whether RAS is present or not in HW, define this macro unconditionally. Its harmless for non-RAS cores as this instruction executes as NOP. Signed-off-by: Manish Pandey Change-Id: I556f2bcf5669c378bda05909525a0a4f96c7b336 --- diff --git a/include/arch/aarch64/asm_macros.S b/include/arch/aarch64/asm_macros.S index b4dab085e..7d1407a22 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