commit 2c47f7fca34174a691ce8b801e9d859607b3ef1d
author Ken Liu <Ken.Liu@arm.com> Fri Jan 22 11:06:04 2021 +0800
committer Ken Liu <ken.liu@arm.com> Fri Feb 05 05:34:51 2021 +0000
tree e664d85f84cd6f590743b1bb6efc9a698521cf4c
parent 4f953f5f50809991510003e588695508effcdbb0

SPM: Refine list operations

List operations is necessary for FFM common logic. Move the header
into 'ffm' folder, and covert inline funtions into MACROs, as list
operations are fast and simple enough.

The main usage now for the lists is a ring based on the bidirectional
list structure. Other list usage can be added into this file when
necessary.

Change-Id: I45c5eab864f5c4e261b39c89cd42325bb98fa17c
Signed-off-by: Ken Liu <Ken.Liu@arm.com>

secure_fw/spm/cmsis_psa/spm_ipc.c

diff --git a/secure_fw/spm/cmsis_psa/spm_ipc.c b/secure_fw/spm/cmsis_psa/spm_ipc.c
index dd4477b..983d5d4 100644
--- a/secure_fw/spm/cmsis_psa/spm_ipc.c
+++ b/secure_fw/spm/cmsis_psa/spm_ipc.c
@@ -24,7 +24,7 @@
 #include "tfm_core_utils.h"
 #include "tfm_rpc.h"
 #include "tfm_core_trustzone.h"
-#include "tfm_list.h"
+#include "ffm/lists.h"
 #include "tfm_pools.h"
 #include "region.h"
 #include "region_defs.h"
@@ -152,7 +152,7 @@
     p_handle->client_id = client_id;
 
     /* Add handle node to list for next psa functions */
-    tfm_list_add_tail(&service->handle_list, &p_handle->list);
+    BI_LIST_INSERT_BEFORE(&service->handle_list, &p_handle->list);
 
     return p_handle;
 }
@@ -185,7 +185,7 @@
     conn_handle->internal_msg.magic = 0;
 
     /* Remove node from handle list */
-    tfm_list_del_node(&conn_handle->list);
+    BI_LIST_REMOVE_NODE(&conn_handle->list);
 
     /* Back handle buffer to pool */
     tfm_pool_free(conn_handle);
@@ -232,14 +232,14 @@
 struct tfm_msg_body_t *tfm_spm_get_msg_by_signal(struct partition_t *partition,
                                                  psa_signal_t signal)
 {
-    struct tfm_list_node_t *node, *head;
+    struct bi_list_node_t *node, *head;
     struct tfm_msg_body_t *tmp_msg, *msg = NULL;
 
     TFM_CORE_ASSERT(partition);
 
     head = &partition->msg_list;
 
-    if (tfm_list_is_empty(head)) {
+    if (BI_LIST_IS_EMPTY(head)) {
         return NULL;
     }
 
@@ -247,13 +247,13 @@
      * There may be multiple messages for this RoT Service signal, do not clear
      * partition mask until no remaining message. Search may be optimized.
      */
-    TFM_LIST_FOR_EACH(node, head) {
+    BI_LIST_FOR_EACH(node, head) {
         tmp_msg = TFM_GET_CONTAINER_PTR(node, struct tfm_msg_body_t, msg_node);
         if (tmp_msg->service->service_db->signal == signal && msg) {
             return msg;
         } else if (tmp_msg->service->service_db->signal == signal) {
             msg = tmp_msg;
-            tfm_list_del_node(node);
+            BI_LIST_REMOVE_NODE(node);
         }
     }
 
@@ -559,7 +559,7 @@
     TFM_CORE_ASSERT(msg);
 
     /* Add message to partition message list tail */
-    tfm_list_add_tail(&partition->msg_list, &msg->msg_node);
+    BI_LIST_INSERT_BEFORE(&partition->msg_list, &msg->msg_node);
 
     /* Messages put. Update signals */
     partition->signals_asserted |= service->service_db->signal;
@@ -692,7 +692,7 @@
         }
 
         tfm_event_init(&partition->event);
-        tfm_list_init(&partition->msg_list);
+        BI_LIST_INIT_NODE(&partition->msg_list);
 
         pth = &partition->sp_thread;
         if (!pth) {
@@ -730,7 +730,7 @@
         service[i].partition = partition;
         partition->signals_allowed |= service[i].service_db->signal;
 
-        tfm_list_init(&service[i].handle_list);
+        BI_LIST_INIT_NODE(&service[i].handle_list);
     }
 
     /*