diff options
| author | Manish V Badarkhe <manish.badarkhe@arm.com> | 2023-04-28 12:08:37 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-04-28 12:08:37 +0200 |
| commit | e31de867a2fd87d170040c48e7bb7c5d1e1161ae (patch) | |
| tree | 684383f203e2b09e78aaebb0d17f7f51ebe22b2f /include/arch | |
| parent | a49bb6f838a7c79a7eef5e286213c8f772a51187 (diff) | |
| parent | 7d5036b8ec911d83ede6eb73f1693b6f160d90ed (diff) | |
| download | arm-trusted-firmware-e31de867a2fd87d170040c48e7bb7c5d1e1161ae.tar.gz | |
Merge "fix(ras): do not put RAS check before esb macro" into integration
Diffstat (limited to 'include/arch')
| -rw-r--r-- | include/arch/aarch64/asm_macros.S | 5 |
1 files changed, 3 insertions, 2 deletions
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 |