commit ec239bb3d8cd633301b78ece0bd018bb3692befc
author Kevin Peng <kevin.peng@arm.com> Fri Sep 03 15:40:27 2021 +0800
committer Ken Liu <Ken.Liu@arm.com> Wed Sep 29 21:37:47 2021 +0800
tree 943fb440df6b5dc9728fe445c61391a3bc6d8d45
parent d399a1f1db2e2f10d951afc1a1dfb9cf2217b1dd

SPM: New IRQ init and handler integration approach

The IRQ initialization is done by two HAL APIs.
This patch changes to use one API per IRQ.

The IRQ handler matches the handler name in VTOR in template.
This patch changes to let platform integrate.

Change-Id: I004fa4715d3210341f205634aebf509e6f8010e9
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
Co-authored-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 33c8a33..729374d 100644
--- a/secure_fw/spm/cmsis_psa/spm_ipc.c
+++ b/secure_fw/spm/cmsis_psa/spm_ipc.c
@@ -46,8 +46,6 @@
 TFM_POOL_DECLARE(conn_handle_pool, sizeof(struct tfm_conn_handle_t),
                  TFM_CONN_HANDLE_MAX_NUM);
 
-#include "tfm_secure_irq_handlers_ipc.inc"
-
 /*********************** Connection handle conversion APIs *******************/
 
 #define CONVERSION_FACTOR_BITOFFSET    3
@@ -798,7 +796,7 @@
 
 __attribute__((naked))
 static psa_flih_result_t tfm_flih_deprivileged_handling(void *p_pt,
-                                                        psa_flih_func fn_flih,
+                                                        uintptr_t fn_flih,
                                                         void *p_context_ctrl)
 {
     __ASM volatile("SVC %0           \n"
@@ -806,38 +804,41 @@
                    : : "I" (TFM_SVC_PREPARE_DEPRIV_FLIH));
 }
 
-void spm_interrupt_handler(struct partition_load_info_t *p_ldinf,
-                           psa_signal_t signal,
-                           uint32_t irq_line,
-                           psa_flih_func flih_func)
+void spm_handle_interrupt(void *p_pt, struct irq_load_info_t *p_ildi)
 {
     psa_flih_result_t flih_result;
-    struct partition_t *p_pt;
+    struct partition_t *p_part;
 
-    p_pt = tfm_spm_get_partition_by_id(p_ldinf->pid);
-    if (!p_pt) {
+    if (!p_pt || !p_ildi) {
         tfm_core_panic();
     }
 
-    if (flih_func == NULL) {
+    p_part = (struct partition_t *)p_pt;
+
+    if (p_ildi->pid != p_part->p_ldinf->pid) {
+        tfm_core_panic();
+    }
+
+    if (p_ildi->flih_func == NULL) {
         /* SLIH Model Handling */
-        tfm_hal_irq_disable(irq_line);
+        tfm_hal_irq_disable(p_ildi->source);
         flih_result = PSA_FLIH_SIGNAL;
     } else {
         /* FLIH Model Handling */
-        if (tfm_spm_partition_get_privileged_mode(p_ldinf->flags) ==
+        if (tfm_spm_partition_get_privileged_mode(p_part->p_ldinf->flags) ==
                                                 TFM_PARTITION_PRIVILEGED_MODE) {
-            flih_result = flih_func();
+            flih_result = p_ildi->flih_func();
         } else {
             flih_result = tfm_flih_deprivileged_handling(
-                                                      p_pt, flih_func,
-                                                      pth_curr->p_context_ctrl);
+                                                   p_part,
+                                                   (uintptr_t)p_ildi->flih_func,
+                                                   pth_curr->p_context_ctrl);
         }
     }
 
     if (flih_result == PSA_FLIH_SIGNAL) {
         __disable_irq();
-        spm_assert_signal(p_pt, signal);
+        spm_assert_signal(p_pt, p_ildi->signal);
         __enable_irq();
     }
 }