diff options
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/aarch64/bl31_entrypoint.S | 1 | ||||
| -rw-r--r-- | bl31/aarch64/context.S | 4 | ||||
| -rw-r--r-- | bl31/aarch64/cpu_data.S | 3 | ||||
| -rw-r--r-- | bl31/aarch64/crash_reporting.S | 9 | ||||
| -rw-r--r-- | bl31/aarch64/runtime_exceptions.S | 3 |
5 files changed, 20 insertions, 0 deletions
diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S index 186b1cbc..1777d267 100644 --- a/bl31/aarch64/bl31_entrypoint.S +++ b/bl31/aarch64/bl31_entrypoint.S @@ -200,3 +200,4 @@ func bl31_entrypoint bl bl31_main b el3_exit +endfunc bl31_entrypoint diff --git a/bl31/aarch64/context.S b/bl31/aarch64/context.S index b127480a..70a1e5d6 100644 --- a/bl31/aarch64/context.S +++ b/bl31/aarch64/context.S @@ -117,6 +117,7 @@ func el1_sysregs_context_save str x15, [x0, #CTX_FP_FPEXC32_EL2] ret +endfunc el1_sysregs_context_save /* ----------------------------------------------------- * The following function strictly follows the AArch64 @@ -205,6 +206,7 @@ func el1_sysregs_context_restore /* No explict ISB required here as ERET covers it */ ret +endfunc el1_sysregs_context_restore /* ----------------------------------------------------- * The following function follows the aapcs_64 strictly @@ -249,6 +251,7 @@ func fpregs_context_save str x10, [x0, #CTX_FP_FPCR] ret +endfunc fpregs_context_save /* ----------------------------------------------------- * The following function follows the aapcs_64 strictly @@ -298,4 +301,5 @@ func fpregs_context_restore */ ret +endfunc fpregs_context_restore #endif /* CTX_INCLUDE_FPREGS */ diff --git a/bl31/aarch64/cpu_data.S b/bl31/aarch64/cpu_data.S index feb51d61..a53bd6d5 100644 --- a/bl31/aarch64/cpu_data.S +++ b/bl31/aarch64/cpu_data.S @@ -51,6 +51,7 @@ func init_cpu_data_ptr bl _cpu_data_by_mpidr msr tpidr_el3, x0 ret x10 +endfunc init_cpu_data_ptr /* ----------------------------------------------------------------- @@ -68,6 +69,7 @@ func _cpu_data_by_mpidr bl platform_get_core_pos mov x30, x9 b _cpu_data_by_index +endfunc _cpu_data_by_mpidr /* ----------------------------------------------------------------- @@ -83,3 +85,4 @@ func _cpu_data_by_index adr x1, percpu_data add x0, x1, x0, LSL #CPU_DATA_LOG2SIZE ret +endfunc _cpu_data_by_index diff --git a/bl31/aarch64/crash_reporting.S b/bl31/aarch64/crash_reporting.S index 68fe2567..7edbbf2f 100644 --- a/bl31/aarch64/crash_reporting.S +++ b/bl31/aarch64/crash_reporting.S @@ -85,6 +85,7 @@ intr_excpt_msg: func print_newline mov x0, '\n' b plat_crash_console_putc +endfunc print_newline /* * Helper function to print from crash buf. @@ -122,6 +123,7 @@ test_size_list: exit_size_print: mov x30, sp ret +endfunc size_controlled_print /* * Helper function to store x8 - x15 registers to @@ -140,6 +142,7 @@ func str_in_crash_buf_print stp x12, x13, [x0, #REG_SIZE * 4] stp x14, x15, [x0, #REG_SIZE * 6] b size_controlled_print +endfunc str_in_crash_buf_print /* ------------------------------------------------------ * This macro calculates the offset to crash buf from @@ -176,6 +179,7 @@ func report_unhandled_exception mov sp, x0 /* This call will not return */ b do_crash_reporting +endfunc report_unhandled_exception /* ----------------------------------------------------- @@ -192,6 +196,7 @@ func report_unhandled_interrupt mov sp, x0 /* This call will not return */ b do_crash_reporting +endfunc report_unhandled_interrupt /* ----------------------------------------------------- * This function allows to report a crash (if crash @@ -208,6 +213,7 @@ func el3_panic mov sp, x0 /* This call will not return */ b do_crash_reporting +endfunc el3_panic /* ------------------------------------------------------------ * The common crash reporting functionality. It requires x0 @@ -346,13 +352,16 @@ func do_crash_reporting /* Done reporting */ b crash_panic +endfunc do_crash_reporting #else /* CRASH_REPORTING */ func report_unhandled_exception report_unhandled_interrupt: b crash_panic +endfunc report_unhandled_exception #endif /* CRASH_REPORING */ func crash_panic b crash_panic +endfunc crash_panic
\ No newline at end of file diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S index 3265862a..accb11bd 100644 --- a/bl31/aarch64/runtime_exceptions.S +++ b/bl31/aarch64/runtime_exceptions.S @@ -479,6 +479,7 @@ smc_prohibited: rt_svc_fw_critical_error: msr spsel, #1 /* Switch to SP_ELx */ bl report_unhandled_exception +endfunc smc_handler /* ----------------------------------------------------- * The following functions are used to saved and restore @@ -503,6 +504,7 @@ func save_gp_registers stp x16, x17, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X16] save_x18_to_x29_sp_el0 ret +endfunc save_gp_registers func restore_gp_registers_eret ldp x0, x1, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X0] @@ -525,3 +527,4 @@ restore_gp_registers_callee_eret: msr sp_el0, x17 ldp x16, x17, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X16] eret +endfunc restore_gp_registers_eret |