commit b5da9cc416e73aef50a97cb959de4c705049cd2d
author Summer Qin <summer.qin@arm.com> Mon Aug 26 15:19:45 2019 +0800
committer Summer Qin (Arm Technology China) <summer.qin@arm.com> Mon Sep 09 08:44:43 2019 +0100
tree 27556e7fa73698f336bfc0027d079c981db33ff5
parent 423dbef12b45e85bad68a149a72a12565aa61b03

Core: Move thread context into runtime data struct

Move the struct tfm_thrd_ctx sp_thrd into struct
spm_partition_runtime_data_t runtime_data.

Change-Id: Id9dac3f509994029732855098baf1b03e21f5e2c
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 7f773d2..6a7231f 100644
--- a/secure_fw/spm/spm_api_ipc.c
+++ b/secure_fw/spm/spm_api_ipc.c
@@ -376,16 +376,19 @@
 {
     struct tfm_thrd_ctx *pth = tfm_thrd_curr_thread();
     struct spm_partition_desc_t *partition;
+    struct spm_partition_runtime_data_t *r_data;
 
-    partition = TFM_GET_CONTAINER_PTR(pth, struct spm_partition_desc_t,
-                                      sp_thrd);
+    r_data = TFM_GET_CONTAINER_PTR(pth, struct spm_partition_runtime_data_t,
+                                   sp_thrd);
+    partition = TFM_GET_CONTAINER_PTR(r_data, struct spm_partition_desc_t,
+                                      runtime_data);
     return partition->static_data->partition_id;
 }
 
 static struct tfm_thrd_ctx *
     tfm_spm_partition_get_thread_info(uint32_t partition_idx)
 {
-    return &g_spm_partition_db.partitions[partition_idx].sp_thrd;
+    return &g_spm_partition_db.partitions[partition_idx].runtime_data.sp_thrd;
 }
 
 static tfm_thrd_func_t
@@ -525,6 +528,7 @@
 {
 #if TFM_LVL == 2
     struct spm_partition_desc_t *p_next_partition;
+    struct spm_partition_runtime_data_t *r_data;
     uint32_t is_privileged;
 #endif
     struct tfm_thrd_ctx *pth_next = tfm_thrd_next_thread();
@@ -532,9 +536,12 @@
 
     if (pth_next != NULL && pth_curr != pth_next) {
 #if TFM_LVL == 2
-        p_next_partition = TFM_GET_CONTAINER_PTR(pth_next,
+        r_data = TFM_GET_CONTAINER_PTR(pth_next,
+                                       struct spm_partition_runtime_data_t,
+                                       sp_thrd);
+        p_next_partition = TFM_GET_CONTAINER_PTR(r_data,
                                                  struct spm_partition_desc_t,
-                                                 sp_thrd);
+                                                 runtime_data);
 
         if (p_next_partition->static_data->partition_flags &
             SPM_PART_FLAG_PSA_ROT) {