commit 423dbef12b45e85bad68a149a72a12565aa61b03
author Summer Qin <summer.qin@arm.com> Thu Aug 22 15:59:35 2019 +0800
committer Summer Qin (Arm Technology China) <summer.qin@arm.com> Mon Sep 09 08:44:30 2019 +0100
tree eb953e7ec49334b4be26f161552256faff020f52
parent 0482270af42d8a2e41bf571df3f79f4a4d4c6f19

Core: Minimize the memory usage for partition list

Split the rodata, data and bss of the partition list.

Change-Id: I1b7e876ceee38b65b871b6be664d46bc7bd49af3
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 3db55b5..7f773d2 100644
--- a/secure_fw/spm/spm_api_ipc.c
+++ b/secure_fw/spm/spm_api_ipc.c
@@ -264,7 +264,7 @@
 
     /* For condition 2: check if the partition ID is same */
     partition_id = tfm_spm_partition_get_running_partition_id();
-    if (partition_id != msg->service->partition->static_data.partition_id) {
+    if (partition_id != msg->service->partition->static_data->partition_id) {
         return NULL;
     }
 
@@ -364,12 +364,12 @@
 uint32_t tfm_spm_partition_get_stack_bottom(uint32_t partition_idx)
 {
     return g_spm_partition_db.partitions[partition_idx].
-            memory_data.stack_bottom;
+            memory_data->stack_bottom;
 }
 
 uint32_t tfm_spm_partition_get_stack_top(uint32_t partition_idx)
 {
-    return g_spm_partition_db.partitions[partition_idx].memory_data.stack_top;
+    return g_spm_partition_db.partitions[partition_idx].memory_data->stack_top;
 }
 
 uint32_t tfm_spm_partition_get_running_partition_id(void)
@@ -379,7 +379,7 @@
 
     partition = TFM_GET_CONTAINER_PTR(pth, struct spm_partition_desc_t,
                                       sp_thrd);
-    return partition->static_data.partition_id;
+    return partition->static_data->partition_id;
 }
 
 static struct tfm_thrd_ctx *
@@ -392,12 +392,12 @@
     tfm_spm_partition_get_init_func(uint32_t partition_idx)
 {
     return (tfm_thrd_func_t)(g_spm_partition_db.partitions[partition_idx].
-                             static_data.partition_init);
+                             static_data->partition_init);
 }
 
 static uint32_t tfm_spm_partition_get_priority(uint32_t partition_idx)
 {
-    return g_spm_partition_db.partitions[partition_idx].static_data.
+    return g_spm_partition_db.partitions[partition_idx].static_data->
                     partition_priority;
 }
 
@@ -460,7 +460,7 @@
     for (i = 0; i < g_spm_partition_db.partition_count; i++) {
         partition = &g_spm_partition_db.partitions[i];
         tfm_spm_hal_configure_default_isolation(partition->platform_data);
-        partition->static_data.index = i;
+        partition->runtime_data.index = i;
         if ((tfm_spm_partition_get_flags(i) & SPM_PART_FLAG_IPC) == 0) {
             continue;
         }
@@ -536,7 +536,7 @@
                                                  struct spm_partition_desc_t,
                                                  sp_thrd);
 
-        if (p_next_partition->static_data.partition_flags &
+        if (p_next_partition->static_data->partition_flags &
             SPM_PART_FLAG_PSA_ROT) {
             is_privileged = TFM_PARTITION_PRIVILEGED_MODE;
         } else {