commit 66f1e03d8126ddfa4749d8ed379775e655dad95a
author Summer Qin <summer.qin@arm.com> Mon Jan 06 15:40:03 2020 +0800
committer Ken Liu <ken.liu@arm.com> Thu Feb 13 07:22:14 2020 +0000
tree 1f57eff896c876f84654076bc937c3f71276c2ed
parent e9b61a79cae79af3dd8228c94e51fd8f796880be

Core: Thread structure refine

- Change the thread context structure name from 'struct tfm_thrd_ctx' to
  'struct tfm_core_thread_t'.
- Change the thread context structure member from 'status' to 'state' to
  indicate the state machine of thread better.
- Add 'core' prefix of thread functions to indicate that these functions
  are under core scope.

Change-Id: I642956f4dde0c7cf9e0f98fbb3c670335d1b85de
Signed-off-by: Summer Qin <summer.qin@arm.com>

secure_fw/spm/spm_api_ipc.c

diff --git a/secure_fw/spm/spm_api_ipc.c b/secure_fw/spm/spm_api_ipc.c
index 38ab043..ec25b41 100644
--- a/secure_fw/spm/spm_api_ipc.c
+++ b/secure_fw/spm/spm_api_ipc.c
@@ -445,7 +445,7 @@
 
 uint32_t tfm_spm_partition_get_running_partition_id(void)
 {
-    struct tfm_thrd_ctx *pth = tfm_thrd_curr_thread();
+    struct tfm_core_thread_t *pth = tfm_core_thrd_get_curr_thread();
     struct spm_partition_desc_t *partition;
     struct spm_partition_runtime_data_t *r_data;
 
@@ -456,16 +456,16 @@
     return partition->static_data->partition_id;
 }
 
-static struct tfm_thrd_ctx *
+static struct tfm_core_thread_t *
     tfm_spm_partition_get_thread_info(uint32_t partition_idx)
 {
     return &g_spm_partition_db.partitions[partition_idx].runtime_data.sp_thrd;
 }
 
-static tfm_thrd_func_t
+static tfm_core_thrd_entry_t
     tfm_spm_partition_get_init_func(uint32_t partition_idx)
 {
-    return (tfm_thrd_func_t)(g_spm_partition_db.partitions[partition_idx].
+    return (tfm_core_thrd_entry_t)(g_spm_partition_db.partitions[partition_idx].
                              static_data->partition_init);
 }
 
@@ -514,7 +514,7 @@
 {
     uint32_t i, j, num;
     struct spm_partition_desc_t *partition;
-    struct tfm_thrd_ctx *pth, *p_ns_entry_thread = NULL;
+    struct tfm_core_thread_t *pth, *p_ns_entry_thread = NULL;
     const struct tfm_spm_partition_platform_data_t **platform_data_p;
 
     tfm_pool_init(conn_handle_pool,
@@ -567,11 +567,11 @@
             tfm_core_panic();
         }
 
-        tfm_thrd_init(pth,
-                      tfm_spm_partition_get_init_func(i),
-                      NULL,
-                      (uintptr_t)tfm_spm_partition_get_stack_top(i),
-                      (uintptr_t)tfm_spm_partition_get_stack_bottom(i));
+        tfm_core_thrd_init(pth,
+                           tfm_spm_partition_get_init_func(i),
+                           NULL,
+                           (uintptr_t)tfm_spm_partition_get_stack_top(i),
+                           (uintptr_t)tfm_spm_partition_get_stack_bottom(i));
 
         pth->prior = tfm_spm_partition_get_priority(i);
 
@@ -581,7 +581,7 @@
         }
 
         /* Kick off */
-        if (tfm_thrd_start(pth) != THRD_SUCCESS) {
+        if (tfm_core_thrd_start(pth) != THRD_SUCCESS) {
             tfm_core_panic();
         }
     }
@@ -614,7 +614,7 @@
      * cleaned up and the background context is never going to return. Tell
      * the scheduler that the current thread is non-secure entry thread.
      */
-    tfm_thrd_start_scheduler(p_ns_entry_thread);
+    tfm_core_thrd_start_scheduler(p_ns_entry_thread);
 
     return p_ns_entry_thread->state_ctx.ctxb.lr;
 }
@@ -626,8 +626,8 @@
     struct spm_partition_runtime_data_t *r_data;
     uint32_t is_privileged;
 #endif
-    struct tfm_thrd_ctx *pth_next = tfm_thrd_next_thread();
-    struct tfm_thrd_ctx *pth_curr = tfm_thrd_curr_thread();
+    struct tfm_core_thread_t *pth_next = tfm_core_thrd_get_next_thread();
+    struct tfm_core_thread_t *pth_curr = tfm_core_thrd_get_curr_thread();
 
     if (pth_next != NULL && pth_curr != pth_next) {
 #if TFM_LVL == 2
@@ -648,7 +648,7 @@
         tfm_spm_partition_change_privilege(is_privileged);
 #endif
 
-        tfm_thrd_context_switch(ctxb, pth_curr, pth_next);
+        tfm_core_thrd_switch_context(ctxb, pth_curr, pth_next);
     }
 
     /*