diff options
Diffstat (limited to 'bl32')
| -rw-r--r-- | bl32/tsp/aarch64/tsp_entrypoint.S | 16 | ||||
| -rw-r--r-- | bl32/tsp/tsp_main.c | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/bl32/tsp/aarch64/tsp_entrypoint.S b/bl32/tsp/aarch64/tsp_entrypoint.S index a859e175..2c325785 100644 --- a/bl32/tsp/aarch64/tsp_entrypoint.S +++ b/bl32/tsp/aarch64/tsp_entrypoint.S @@ -156,7 +156,7 @@ endfunc tsp_entrypoint * ------------------------------------------- */ func tsp_vector_table - b tsp_std_smc_entry + b tsp_yield_smc_entry b tsp_fast_smc_entry b tsp_cpu_on_entry b tsp_cpu_off_entry @@ -165,7 +165,7 @@ func tsp_vector_table b tsp_sel1_intr_entry b tsp_system_off_entry b tsp_system_reset_entry - b tsp_abort_std_smc_entry + b tsp_abort_yield_smc_entry endfunc tsp_vector_table /*--------------------------------------------- @@ -413,12 +413,12 @@ endfunc tsp_fast_smc_entry /*--------------------------------------------- * This entrypoint is used by the TSPD to ask - * the TSP to service a std smc request. + * the TSP to service a Yielding SMC request. * We will enable preemption during execution * of tsp_smc_handler. * --------------------------------------------- */ -func tsp_std_smc_entry +func tsp_yield_smc_entry msr daifclr, #DAIF_FIQ_BIT | DAIF_IRQ_BIT bl tsp_smc_handler msr daifset, #DAIF_FIQ_BIT | DAIF_IRQ_BIT @@ -426,15 +426,15 @@ func tsp_std_smc_entry /* Should never reach here */ no_ret plat_panic_handler -endfunc tsp_std_smc_entry +endfunc tsp_yield_smc_entry /*--------------------------------------------------------------------- - * This entrypoint is used by the TSPD to abort a pre-empted Standard + * This entrypoint is used by the TSPD to abort a pre-empted Yielding * SMC. It could be on behalf of non-secure world or because a CPU * suspend/CPU off request needs to abort the preempted SMC. * -------------------------------------------------------------------- */ -func tsp_abort_std_smc_entry +func tsp_abort_yield_smc_entry /* * Exceptions masking is already done by the TSPD when entering this @@ -453,4 +453,4 @@ func tsp_abort_std_smc_entry /* Should never reach here */ bl plat_panic_handler -endfunc tsp_abort_std_smc_entry +endfunc tsp_abort_yield_smc_entry diff --git a/bl32/tsp/tsp_main.c b/bl32/tsp/tsp_main.c index dd8936f2..0de0ca85 100644 --- a/bl32/tsp/tsp_main.c +++ b/bl32/tsp/tsp_main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -348,7 +348,7 @@ tsp_args_t *tsp_smc_handler(uint64_t func, tsp_stats[linear_id].eret_count++; INFO("TSP: cpu 0x%lx received %s smc 0x%lx\n", read_mpidr(), - ((func >> 31) & 1) == 1 ? "fast" : "standard", + ((func >> 31) & 1) == 1 ? "fast" : "yielding", func); INFO("TSP: cpu 0x%lx: %d smcs, %d erets\n", read_mpidr(), tsp_stats[linear_id].smc_count, @@ -394,7 +394,7 @@ tsp_args_t *tsp_smc_handler(uint64_t func, /******************************************************************************* * TSP smc abort handler. This function is called when aborting a preemtped - * standard SMC request. It should cleanup all resources owned by the SMC + * yielding SMC request. It should cleanup all resources owned by the SMC * handler such as locks or dynamically allocated memory so following SMC * request are executed in a clean environment. ******************************************************************************/ |