diff options
| author | Bipin Ravi <bipin.ravi@arm.com> | 2023-02-23 23:38:26 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-02-23 23:38:26 +0100 |
| commit | dc2b8e8028c73a4c7a72d138caa26dc447a1d79a (patch) | |
| tree | 4b7eafb290878679a495f3817b51207a86dd8e7a /plat | |
| parent | 66a387d43786cf06f1b437327a7a5e475aa301c7 (diff) | |
| parent | 17d07a552b396a282eed52bfd6bac01052a1a978 (diff) | |
| download | arm-trusted-firmware-dc2b8e8028c73a4c7a72d138caa26dc447a1d79a.tar.gz | |
Merge changes from topic "panic_cleanup" into integration
* changes:
refactor(bl31): use elx_panic for sysreg_handler64
refactor(aarch64): rename do_panic and el3_panic
refactor(aarch64): remove weak links to el3_panic
refactor(aarch64): refactor usage of elx_panic
refactor(aarch64): cleanup HANDLE_EA_EL3_FIRST_NS usage
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/arm/board/fvp_r/fvp_r_debug.S | 2 | ||||
| -rw-r--r-- | plat/common/aarch64/plat_common.c | 17 | ||||
| -rw-r--r-- | plat/renesas/common/aarch64/plat_helpers.S | 4 |
3 files changed, 10 insertions, 13 deletions
diff --git a/plat/arm/board/fvp_r/fvp_r_debug.S b/plat/arm/board/fvp_r/fvp_r_debug.S index 88f0a29a0..cc5ffc074 100644 --- a/plat/arm/board/fvp_r/fvp_r_debug.S +++ b/plat/arm/board/fvp_r/fvp_r_debug.S @@ -11,7 +11,7 @@ .globl el2_panic /*********************************************************** - * The common implementation of do_panic for all BL stages + * The common implementation of el3_panic for all BL stages ***********************************************************/ .section .rodata.panic_str, "aS" diff --git a/plat/common/aarch64/plat_common.c b/plat/common/aarch64/plat_common.c index 8ce1d6c76..042916a7d 100644 --- a/plat/common/aarch64/plat_common.c +++ b/plat/common/aarch64/plat_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2022, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2023, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -77,7 +77,7 @@ const char *get_el_str(unsigned int el) return "EL1"; } -/* RAS functions common to AArch64 ARM platforms */ +/* Handler for External Aborts from lower EL including RAS errors */ void plat_default_ea_handler(unsigned int ea_reason, uint64_t syndrome, void *cookie, void *handle, uint64_t flags) { @@ -93,12 +93,9 @@ void plat_default_ea_handler(unsigned int ea_reason, uint64_t syndrome, void *co ERROR("Unhandled External Abort received on 0x%lx from %s\n", read_mpidr_el1(), get_el_str(level)); ERROR("exception reason=%u syndrome=0x%" PRIx64 "\n", ea_reason, syndrome); -#if HANDLE_EA_EL3_FIRST_NS - /* Skip backtrace for lower EL */ - if (level != MODE_EL3) { - console_flush(); - do_panic(); - } -#endif - panic(); + + /* We reached here due to a panic from a lower EL and assuming this is the default + * platform registered handler that we could call on a lower EL panic. + */ + lower_el_panic(); } diff --git a/plat/renesas/common/aarch64/plat_helpers.S b/plat/renesas/common/aarch64/plat_helpers.S index 21c3bedaf..a7fdfa071 100644 --- a/plat/renesas/common/aarch64/plat_helpers.S +++ b/plat/renesas/common/aarch64/plat_helpers.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2023, Arm Limited and Contributors. All rights reserved. * Copyright (c) 2015-2021, Renesas Electronics Corporation. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -126,7 +126,7 @@ warm_reset: exit: ret x9 _panic: - b do_panic + b el3_panic #endif endfunc plat_get_my_entrypoint |