diff options
| author | Govindraj Raja <govindraj.raja@arm.com> | 2023-01-16 15:11:47 +0000 |
|---|---|---|
| committer | Govindraj Raja <govindraj.raja@arm.com> | 2023-02-21 17:26:01 +0000 |
| commit | 7e619ecc89355136c27d0295858e08c808aa6373 (patch) | |
| tree | d2813d2442f99cc2cf3119c7d8733265587c676f /common | |
| parent | f4be868be94bcbbf0c3a7059d1ba20567144de37 (diff) | |
| download | arm-trusted-firmware-7e619ecc89355136c27d0295858e08c808aa6373.tar.gz | |
refactor(aarch64): refactor usage of elx_panic
Currently we call el3_panic for panics from EL3 and elx_panic for
panics from lower ELs.
When we boot into a rich OS environment and interact with BL31 using
SMC/ABI calls and we can also decide to handle any lower EL panics in
EL3. Panic can occur in lower EL from rich OS or during SMC/ABI calls
after context switch to EL3.
But after booting into any rich OS we may land in panic either from
rich OS or while servicing any SMC call, here the logic to use
el3_panic or elx_panic is flawed as spsr_el3[3:0] is always EL3h
and end up in elx_panic even if panic occurred from EL3 during
SMC handling.
We try to decouple the elx_panic usage for its intended purpose,
introduce lower_el_panic which would call elx_panic, currently
lower_el_panic is called from default platform_ea_handle which
would be called due to panic from any of the lower ELs.
Also remove the weak linkage for elx_panic and rename it to
report_elx_panic which could be used with lower_el_panic.
Change-Id: I268bca89c01c60520d127ef6c7ba851460edc747
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/aarch64/debug.S | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/common/aarch64/debug.S b/common/aarch64/debug.S index 742e022d5..5fdaf6417 100644 --- a/common/aarch64/debug.S +++ b/common/aarch64/debug.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2020, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2023 Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -160,31 +160,10 @@ endfunc asm_print_newline /* This is for the non el3 BL stages to compile through */ .weak el3_panic - .weak elx_panic func do_panic #if CRASH_REPORTING - str x0, [sp, #-0x10]! - mrs x0, currentel - ubfx x0, x0, #MODE_EL_SHIFT, #MODE_EL_WIDTH - cmp x0, #MODE_EL3 -#if !HANDLE_EA_EL3_FIRST_NS - ldr x0, [sp], #0x10 - b.eq el3_panic -#else - b.ne to_panic_common - - /* Check EL the exception taken from */ - mrs x0, spsr_el3 - ubfx x0, x0, #SPSR_EL_SHIFT, #SPSR_EL_WIDTH - cmp x0, #MODE_EL3 - b.ne elx_panic - ldr x0, [sp], #0x10 b el3_panic - -to_panic_common: - ldr x0, [sp], #0x10 -#endif /* HANDLE_EA_EL3_FIRST_NS */ #endif /* CRASH_REPORTING */ panic_common: |