Merge pull request #925 from dp-arm/dp/spdx

[project/bcm63xx/atf.git] / include / bl32 / tsp / tsp.h

diff --git a/include/bl32/tsp/tsp.h b/include/bl32/tsp/tsp.h
index 599cd2ce6d9df60533727421d37ebcbc2c07d571..43bba8f5ec732fa11c949b31ba2825569a724e91 100644 (file)
--- a/include/bl32/tsp/tsp.h
+++ b/include/bl32/tsp/tsp.h
@@ -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
  */
@@ -22,7 +22,7 @@
 #define TSP_SYSTEM_RESET_DONE  0xf2000009
 
 /*
- * Function identifiers to handle S-El1 interrupt through the synchronous
+ * Function identifiers to handle S-EL1 interrupt through the synchronous
  * handling model. If the TSP was previously interrupted then control has to
  * be returned to the TSPD after handling the interrupt else execution can
  * remain in the TSP.
@@ -34,7 +34,7 @@
 
 /*
  * Identifiers for various TSP services. Corresponding function IDs (whether
- * fast or standard) are generated by macros defined below
+ * fast or yielding) are generated by macros defined below
  */
 #define TSP_ADD                0x2000
 #define TSP_SUB                0x2001
@@ -50,15 +50,15 @@
 
 /*
  * Generate function IDs for TSP services to be used in SMC calls, by
- * appropriately setting bit 31 to differentiate standard and fast SMC calls
+ * appropriately setting bit 31 to differentiate yielding and fast SMC calls
  */
-#define TSP_STD_FID(fid)       ((TSP_BARE_FID(fid) | 0x72000000))
+#define TSP_YIELD_FID(fid)     ((TSP_BARE_FID(fid) | 0x72000000))
 #define TSP_FAST_FID(fid)      ((TSP_BARE_FID(fid) | 0x72000000) | (1u << 31))
 
-/* SMC function ID to request a previously preempted std smc */
-#define TSP_FID_RESUME         TSP_STD_FID(0x3000)
+/* SMC function ID to request a previously preempted yielding smc */
+#define TSP_FID_RESUME         TSP_YIELD_FID(0x3000)
 /*
- * SMC function ID to request abortion of a previously preempted std smc. A
+ * SMC function ID to request abortion of a previously preempted yielding SMC. A
  * fast SMC is used so that the TSP abort handler does not have to be
  * reentrant.
  */
@@ -92,7 +92,7 @@
 typedef uint32_t tsp_vector_isn_t;
 
 typedef struct tsp_vectors {
-       tsp_vector_isn_t std_smc_entry;
+       tsp_vector_isn_t yield_smc_entry;
        tsp_vector_isn_t fast_smc_entry;
        tsp_vector_isn_t cpu_on_entry;
        tsp_vector_isn_t cpu_off_entry;
@@ -101,7 +101,7 @@ typedef struct tsp_vectors {
        tsp_vector_isn_t sel1_intr_entry;
        tsp_vector_isn_t system_off_entry;
        tsp_vector_isn_t system_reset_entry;
-       tsp_vector_isn_t abort_std_smc_entry;
+       tsp_vector_isn_t abort_yield_smc_entry;
 } tsp_vectors_t;