commit 5d73c87273531ca5b1926fb67e7b1b02ce34e723
author Ken Liu <Ken.Liu@arm.com> Thu Aug 19 19:23:17 2021 +0800
committer Ken Liu <ken.liu@arm.com> Mon Sep 27 11:23:08 2021 +0200
tree c2fed1b18e43251f80208e35d611de9548bb8ebf
parent c4c19ec791a3b7918b4b1960d47e46bb4721b705

SPM: Abstract and update SPM module 'thread'

Thread is now abstracted, with an example implementation
'compact thread', providing different thread implementation
is now possible.

The main changes are:

- "wait" module into "thread", as it accesses thread internal members.

- Context control (sp, splimit, lr) belongs to partition now and stored
  in partition struct managed by SPM, instead of being saved on thread
  members.

- Abstracted functionalities used by both thread initialization and
  de-privileged FLIH, and future SFN as well.

- Interrupt signal is set in ISR instead of FLIH_RET SVC handler
- Interrupt owner PID and signal are not stacked anymore. Because
  they can be fetched in State Context, passed by the
  tfm_flih_deprivileged_handling() function

- The context of the running FLIH Function - including the stack
  pointers and the owner Partition - are updated to the new current
  thread struct

Change-Id: I6348e2d0522791ddb1f754ecf86b26bfb5e11daa
Signed-off-by: Ken Liu <Ken.Liu@arm.com>
Co-authored-by: Kevin Peng <kevin.peng@arm.com>

secure_fw/spm/ffm/psa_api.c

diff --git a/secure_fw/spm/ffm/psa_api.c b/secure_fw/spm/ffm/psa_api.c
index 4036e97..f41dc4c 100644
--- a/secure_fw/spm/ffm/psa_api.c
+++ b/secure_fw/spm/ffm/psa_api.c
@@ -17,7 +17,6 @@
 #include "load/interrupt_defs.h"
 #include "psa_api.h"
 #include "utilities.h"
-#include "tfm_wait.h"
 #include "ffm/spm_error_base.h"
 #include "tfm_rpc.h"
 #include "tfm_spm_hal.h"
@@ -419,7 +418,7 @@
     }
 
     /*
-     * tfm_event_wait() blocks the caller thread if no signals are available.
+     * thrd_wait_on() blocks the caller thread if no signals are available.
      * In this case, the return value of this function is temporary set into
      * runtime context. After new signal(s) are available, the return value
      * is updated with the available signal(s) and blocked thread gets to run.
@@ -427,10 +426,11 @@
     if (timeout == PSA_BLOCK &&
         (partition->signals_asserted & signal_mask) == 0) {
         partition->signals_waiting = signal_mask;
-        tfm_event_wait(&partition->event);
+        thrd_wait_on(&partition->waitobj,
+                     &(tfm_spm_get_running_partition()->thrd));
     } else if ((partition->signals_asserted & signal_mask) == 0) {
         /* Activate scheduler to check if any higher priority thread to run */
-        tfm_core_thrd_activate_schedule();
+        tfm_arch_trigger_pendsv();
     }
 
     return partition->signals_asserted & signal_mask;
@@ -782,13 +782,15 @@
     if (is_tfm_rpc_msg(msg)) {
         tfm_rpc_client_call_reply(msg, ret);
     } else {
-        tfm_event_wake(&msg->ack_evnt, ret);
+        thrd_wake_up(&msg->ack_evnt, ret);
     }
 }
 
 void tfm_spm_partition_psa_notify(int32_t partition_id)
 {
-    notify_with_signal(partition_id, PSA_DOORBELL);
+    struct partition_t *p_pt = tfm_spm_get_partition_by_id(partition_id);
+
+    spm_assert_signal(p_pt, PSA_DOORBELL);
 }
 
 void tfm_spm_partition_psa_clear(void)