Update terminology: standard SMC to yielding SMC

Since Issue B (November 2016) of the SMC Calling Convention document
standard SMC calls are renamed to yielding SMC calls to help avoid
confusion with the standard service SMC range, which remains unchanged.

http://infocenter.arm.com/help/topic/com.arm.doc.den0028b/ARM_DEN0028B_SMC_Calling_Convention.pdf

This patch adds a new define for yielding SMC call type and deprecates
the current standard SMC call type. The tsp is migrated to use this new
terminology and, additionally, the documentation and code comments are
updated to use this new terminology.

Change-Id: I0d7cc0224667ee6c050af976745f18c55906a793
Signed-off-by: David Cunado <david.cunado@arm.com>

2 files changed, 11 insertions, 11 deletions

diff --git a/bl32/tsp/aarch64/tsp_entrypoint.S b/bl32/tsp/aarch64/tsp_entrypoint.S
index 3f281394..834dedbe 100644
--- a/bl32/tsp/aarch64/tsp_entrypoint.S
+++ b/bl32/tsp/aarch64/tsp_entrypoint.S
@@ -180,7 +180,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
@@ -189,7 +189,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
 
 	/*---------------------------------------------
@@ -437,12 +437,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
@@ -450,15 +450,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
@@ -477,4 +477,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 2b365320..b4010f36 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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -372,7 +372,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,
@@ -418,7 +418,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.
  ******************************************************************************/