diff options
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/aarch64/crash_reporting.S | 6 | ||||
| -rw-r--r-- | bl31/aarch64/runtime_exceptions.S | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/bl31/aarch64/crash_reporting.S b/bl31/aarch64/crash_reporting.S index 7f5a86b06..8e603862f 100644 --- a/bl31/aarch64/crash_reporting.S +++ b/bl31/aarch64/crash_reporting.S @@ -350,17 +350,17 @@ func do_crash_reporting plat_crash_print_regs /* Done reporting */ - bl plat_panic_handler + no_ret plat_panic_handler endfunc do_crash_reporting #else /* CRASH_REPORTING */ func report_unhandled_exception report_unhandled_interrupt: - bl plat_panic_handler + no_ret plat_panic_handler endfunc report_unhandled_exception #endif /* CRASH_REPORTING */ func crash_panic - bl plat_panic_handler + no_ret plat_panic_handler endfunc crash_panic diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S index 220d1cc17..6909d08cb 100644 --- a/bl31/aarch64/runtime_exceptions.S +++ b/bl31/aarch64/runtime_exceptions.S @@ -73,7 +73,7 @@ b.eq smc_handler64 /* Other kinds of synchronous exceptions are not handled */ - bl report_unhandled_exception + no_ret report_unhandled_exception .endm @@ -176,7 +176,7 @@ vector_base runtime_exceptions */ vector_entry sync_exception_sp_el0 /* We don't expect any synchronous exceptions from EL3 */ - bl report_unhandled_exception + no_ret report_unhandled_exception check_vector_size sync_exception_sp_el0 vector_entry irq_sp_el0 @@ -184,17 +184,17 @@ vector_entry irq_sp_el0 * EL3 code is non-reentrant. Any asynchronous exception is a serious * error. Loop infinitely. */ - bl report_unhandled_interrupt + no_ret report_unhandled_interrupt check_vector_size irq_sp_el0 vector_entry fiq_sp_el0 - bl report_unhandled_interrupt + no_ret report_unhandled_interrupt check_vector_size fiq_sp_el0 vector_entry serror_sp_el0 - bl report_unhandled_exception + no_ret report_unhandled_exception check_vector_size serror_sp_el0 /* --------------------------------------------------------------------- @@ -208,19 +208,19 @@ vector_entry sync_exception_sp_elx * synchronous exception. There is a high probability that SP_EL3 is * corrupted. */ - bl report_unhandled_exception + no_ret report_unhandled_exception check_vector_size sync_exception_sp_elx vector_entry irq_sp_elx - bl report_unhandled_interrupt + no_ret report_unhandled_interrupt check_vector_size irq_sp_elx vector_entry fiq_sp_elx - bl report_unhandled_interrupt + no_ret report_unhandled_interrupt check_vector_size fiq_sp_elx vector_entry serror_sp_elx - bl report_unhandled_exception + no_ret report_unhandled_exception check_vector_size serror_sp_elx /* --------------------------------------------------------------------- @@ -250,7 +250,7 @@ vector_entry serror_aarch64 * SError exceptions from lower ELs are not currently supported. * Report their occurrence. */ - bl report_unhandled_exception + no_ret report_unhandled_exception check_vector_size serror_aarch64 /* --------------------------------------------------------------------- @@ -280,7 +280,7 @@ vector_entry serror_aarch32 * SError exceptions from lower ELs are not currently supported. * Report their occurrence. */ - bl report_unhandled_exception + no_ret report_unhandled_exception check_vector_size serror_aarch32 @@ -415,5 +415,5 @@ smc_prohibited: rt_svc_fw_critical_error: /* Switch to SP_ELx */ msr spsel, #1 - bl report_unhandled_exception + no_ret report_unhandled_exception endfunc smc_handler |