commit e578c5b74dc35293cd12e32014368be522d1aef3
author Summer Qin <summer.qin@arm.com> Fri Aug 16 16:42:16 2019 +0800
committer Summer Qin (Arm Technology China) <summer.qin@arm.com> Tue Aug 20 06:48:14 2019 +0100
tree fbf83465dd438442f109d52c5543ab378b36c9a9
parent 33f2fd2b001fa200b21d0086d2ae63b9de74dda4

Core: Minimize the memory usage for service list

Split the rodata, data and bss of the service information.

Change-Id: I27b304dcde4220ebe106ba5ed8363da525ca351a
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 13a00bb..3db55b5 100644
--- a/secure_fw/spm/spm_api_ipc.c
+++ b/secure_fw/spm/spm_api_ipc.c
@@ -32,6 +32,7 @@
 
 /* Extern service variable */
 extern struct tfm_spm_service_t service[];
+extern const struct tfm_spm_service_db_t service_db[];
 
 /* Extern SPM variable */
 extern struct spm_partition_db_t g_spm_partition_db;
@@ -151,7 +152,7 @@
     head = &partition->runtime_data.service_list;
     TFM_LIST_FOR_EACH(node, head) {
         service = TFM_GET_CONTAINER_PTR(node, struct tfm_spm_service_t, list);
-        if (service->service_db.signal == signal) {
+        if (service->service_db->signal == signal) {
             return service;
         }
     }
@@ -180,7 +181,7 @@
         TFM_LIST_FOR_EACH(node, head) {
             service = TFM_GET_CONTAINER_PTR(node, struct tfm_spm_service_t,
                                             list);
-            if (service->service_db.sid == sid) {
+            if (service->service_db->sid == sid) {
                 return service;
             }
         }
@@ -218,14 +219,14 @@
 {
     TFM_ASSERT(service);
 
-    switch (service->service_db.minor_policy) {
+    switch (service->service_db->minor_policy) {
     case TFM_VERSION_POLICY_RELAXED:
-        if (minor_version > service->service_db.minor_version) {
+        if (minor_version > service->service_db->minor_version) {
             return IPC_ERROR_VERSION;
         }
         break;
     case TFM_VERSION_POLICY_STRICT:
-        if (minor_version != service->service_db.minor_version) {
+        if (minor_version != service->service_db->minor_version) {
             return IPC_ERROR_VERSION;
         }
         break;
@@ -350,7 +351,7 @@
     }
 
     /* Messages put. Update signals */
-    p_runtime_data->signals |= service->service_db.signal;
+    p_runtime_data->signals |= service->service_db->signal;
 
     tfm_event_wake(&p_runtime_data->signal_evnt, (p_runtime_data->signals &
                                                   p_runtime_data->signal_mask));
@@ -448,7 +449,6 @@
 {
     uint32_t i, num;
     struct spm_partition_desc_t *partition;
-    /*struct tfm_spm_service_t *service;*/
     struct tfm_thrd_ctx *pth, this_thrd;
 
     tfm_pool_init(conn_handle_pool,
@@ -490,8 +490,9 @@
     /* Init Service */
     num = sizeof(service) / sizeof(struct tfm_spm_service_t);
     for (i = 0; i < num; i++) {
+        service[i].service_db = &service_db[i];
         partition =
-            tfm_spm_get_partition_by_id(service[i].service_db.partition_id);
+            tfm_spm_get_partition_by_id(service[i].service_db->partition_id);
         if (!partition) {
             tfm_panic();
         }