psoc64: Update TF-M for MBedOS

Charley Chu · Charley Chu · commit 5814a49595df · 2020-07-08T18:29:23.000-07:00
- Replace TF-M OS wrapper API with CMSIS API
    - Add busy loop in mailbox_raw_spin_lock()
    - Rename the IPC8 IRQ handler
    - Use static allocated semaphore for NS lock

Signed-off-by: Charley Chu &lt;haoc@cypress.com&gt;
diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/platform_ns_mailbox.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/platform_ns_mailbox.c
@@ -16,10 +16,9 @@
 #include "cy_ipc_sema.h"
 
 #include "ns_ipc_config.h"
-#include "os_wrapper/thread.h"
-#include "os_wrapper/semaphore.h"
 #include "tfm_ns_mailbox.h"
 #include "platform_multicore.h"
+#include "cmsis_os2.h"
 
 static uint8_t saved_irq_state = 1;
 
@@ -121,22 +120,22 @@ int32_t tfm_ns_mailbox_hal_init(struct ns_mailbox_queue_t *queue)
 
 void * tfm_ns_mailbox_hal_create_semaphore(void)
 {
-    return os_wrapper_semaphore_create(1, 0, NULL);
+    return osSemaphoreNew(1, 0, NULL);
 }
 
 void tfm_ns_mailbox_hal_wait_reply(mailbox_msg_handle_t handle)
 {
     void *sem = tfm_ns_mailbox_get_msg_semaphore(handle);
     if (sem != NULL) {
-        os_wrapper_semaphore_acquire(sem, OS_WRAPPER_WAIT_FOREVER);
+        osSemaphoreAcquire(sem, osWaitForever);
     }
 }
 
 void tfm_ns_mailbox_hal_delete_semaphore(mailbox_msg_handle_t handle)
 {
     void *sem = tfm_ns_mailbox_get_msg_semaphore(handle);
     if (sem != NULL) {
-        os_wrapper_semaphore_delete(sem);
+        osSemaphoreDelete(sem);
     }
 }
 
@@ -191,6 +190,10 @@ static cy_en_ipcsema_status_t mailbox_raw_spin_lock(uint32_t ipc_channel,
                  * notification event from secure core. However, it is more
                  * complex and requires more code and more modifications.
                  */
+                volatile uint32_t count = 1000;
+                while(count > 0) {
+                    count--;
+                }
                 Cy_IPC_Sema_Status(sema_num);
             }
         }
@@ -285,7 +288,7 @@ static bool mailbox_clear_intr(void)
     return true;
 }
 
-void tfm_ns_mailbox_ipc_IRQHandler(void)
+void cpuss_interrupts_ipc_8_IRQHandler(void)
 {
     uint32_t magic;
     mailbox_msg_handle_t handle;
@@ -306,9 +309,8 @@ void tfm_ns_mailbox_ipc_IRQHandler(void)
 
             sem = (void *)tfm_ns_mailbox_get_msg_semaphore(handle);
             if (sem) {
-                yield |= os_wrapper_semaphore_release_isr(sem);
+                yield |= osSemaphoreRelease(sem);
             }
         }
-        os_wrapper_isr_yield(yield);
     }
 }
diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_multi_core_api.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_multi_core_api.c
@@ -5,22 +5,30 @@
  *
  */
 
-#include "os_wrapper/semaphore.h"
-
 #include "tfm_api.h"
 #include "tfm_mailbox.h"
 #include "tfm_multi_core_api.h"
+#include "cmsis_os2.h"
+#include "mbed_rtos_storage.h"
 
 #define MAX_SEMAPHORE_COUNT            NUM_MAILBOX_QUEUE_SLOT
 
 static void *ns_lock_handle = NULL;
+static mbed_rtos_storage_semaphore_t tfm_ns_sema_obj;
 
 __attribute__((weak))
 enum tfm_status_e tfm_ns_interface_init(void)
 {
-    ns_lock_handle = os_wrapper_semaphore_create(MAX_SEMAPHORE_COUNT,
-                                                 MAX_SEMAPHORE_COUNT,
-                                                 NULL);
+    osSemaphoreAttr_t sema_attrib = {
+        .name = "tfm_ns_lock",
+        .attr_bits = 0,
+        .cb_size = sizeof(tfm_ns_sema_obj),
+        .cb_mem = &tfm_ns_sema_obj
+    };
+
+    ns_lock_handle = osSemaphoreNew(MAX_SEMAPHORE_COUNT,
+                                    MAX_SEMAPHORE_COUNT,
+                                    &sema_attrib);
     if (!ns_lock_handle) {
         return TFM_ERROR_GENERIC;
     }
@@ -35,11 +43,10 @@ int32_t tfm_ns_wait_for_s_cpu_ready(void)
 
 uint32_t tfm_ns_multi_core_lock_acquire(void)
 {
-    return os_wrapper_semaphore_acquire(ns_lock_handle,
-                                        OS_WRAPPER_WAIT_FOREVER);
+    return osSemaphoreAcquire(ns_lock_handle, osWaitForever);
 }
 
 uint32_t tfm_ns_multi_core_lock_release(void)
 {
-    return os_wrapper_semaphore_release(ns_lock_handle);
+    return osSemaphoreRelease(ns_lock_handle);
 }
diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_multi_core_psa_ns_api.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_multi_core_psa_ns_api.c
@@ -8,8 +8,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "os_wrapper/mutex.h"
-
 #include "psa/client.h"
 #include "psa/error.h"
 #include "tfm_api.h"
@@ -64,7 +62,7 @@ uint32_t psa_framework_version(void)
     uint32_t version;
     int32_t ret;
 
-    if (tfm_ns_multi_core_lock_acquire() != OS_WRAPPER_SUCCESS) {
+    if (tfm_ns_multi_core_lock_acquire() != 0) {
         return PSA_VERSION_NONE;
     }
 
@@ -82,7 +80,7 @@ uint32_t psa_framework_version(void)
         version = PSA_VERSION_NONE;
     }
 
-    if (tfm_ns_multi_core_lock_release() != OS_WRAPPER_SUCCESS) {
+    if (tfm_ns_multi_core_lock_release() != 0) {
         return PSA_VERSION_NONE;
     }
 
@@ -98,7 +96,7 @@ uint32_t psa_version(uint32_t sid)
 
     params.psa_version_params.sid = sid;
 
-    if (tfm_ns_multi_core_lock_acquire() != OS_WRAPPER_SUCCESS) {
+    if (tfm_ns_multi_core_lock_acquire() != 0) {
         return PSA_VERSION_NONE;
     }
 
@@ -116,7 +114,7 @@ uint32_t psa_version(uint32_t sid)
         version = PSA_VERSION_NONE;
     }
 
-    if (tfm_ns_multi_core_lock_release() != OS_WRAPPER_SUCCESS) {
+    if (tfm_ns_multi_core_lock_release() != 0) {
         return PSA_VERSION_NONE;
     }
 
@@ -133,7 +131,7 @@ psa_handle_t psa_connect(uint32_t sid, uint32_t version)
     params.psa_connect_params.sid = sid;
     params.psa_connect_params.version = version;
 
-    if (tfm_ns_multi_core_lock_acquire() != OS_WRAPPER_SUCCESS) {
+    if (tfm_ns_multi_core_lock_acquire() != 0) {
         return PSA_NULL_HANDLE;
     }
 
@@ -151,7 +149,7 @@ psa_handle_t psa_connect(uint32_t sid, uint32_t version)
         psa_handle = PSA_NULL_HANDLE;
     }
 
-    if (tfm_ns_multi_core_lock_release() != OS_WRAPPER_SUCCESS) {
+    if (tfm_ns_multi_core_lock_release() != 0) {
         return PSA_NULL_HANDLE;
     }
 
@@ -174,7 +172,7 @@ psa_status_t psa_call(psa_handle_t handle, int32_t type,
     params.psa_call_params.out_vec = out_vec;
     params.psa_call_params.out_len = out_len;
 
-    if (tfm_ns_multi_core_lock_acquire() != OS_WRAPPER_SUCCESS) {
+    if (tfm_ns_multi_core_lock_acquire() != 0) {
         return PSA_ERROR_GENERIC_ERROR;
     }
 
@@ -192,7 +190,7 @@ psa_status_t psa_call(psa_handle_t handle, int32_t type,
         status = PSA_INTER_CORE_COMM_ERR;
     }
 
-    if (tfm_ns_multi_core_lock_release() != OS_WRAPPER_SUCCESS) {
+    if (tfm_ns_multi_core_lock_release() != 0) {
         return PSA_ERROR_GENERIC_ERROR;
     }
 
@@ -207,7 +205,7 @@ void psa_close(psa_handle_t handle)
 
     params.psa_close_params.handle = handle;
 
-    if (tfm_ns_multi_core_lock_acquire() != OS_WRAPPER_SUCCESS) {
+    if (tfm_ns_multi_core_lock_acquire() != 0) {
         return;
     }
 
diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/platform_multicore.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/platform_multicore.h
@@ -19,10 +19,10 @@
 #define IPC_PSA_CLIENT_CALL_IPC_INTR     cpuss_interrupts_ipc_6_IRQn
 
 #define IPC_PSA_CLIENT_REPLY_CHAN        (9)
-#define IPC_PSA_CLIENT_REPLY_INTR_STRUCT (5)
+#define IPC_PSA_CLIENT_REPLY_INTR_STRUCT (8)
 #define IPC_PSA_CLIENT_REPLY_INTR_MASK   (1 << IPC_PSA_CLIENT_REPLY_CHAN)
 #define IPC_PSA_CLIENT_REPLY_NOTIFY_MASK (1 << IPC_PSA_CLIENT_REPLY_INTR_STRUCT)
-#define IPC_PSA_CLIENT_REPLY_IPC_INTR    cpuss_interrupts_ipc_5_IRQn
+#define IPC_PSA_CLIENT_REPLY_IPC_INTR    cpuss_interrupts_ipc_8_IRQn
 
 #define IPC_RX_RELEASE_MASK              (0)
 

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,9 @@`
`16`	`16`	`#include "cy_ipc_sema.h"`
`17`	`17`
`18`	`18`	`#include "ns_ipc_config.h"`
`19`		`-#include "os_wrapper/thread.h"`
`20`		`-#include "os_wrapper/semaphore.h"`
`21`	`19`	`#include "tfm_ns_mailbox.h"`
`22`	`20`	`#include "platform_multicore.h"`
	`21`	`+#include "cmsis_os2.h"`
`23`	`22`
`24`	`23`	`static uint8_t saved_irq_state = 1;`
`25`	`24`
`@@ -121,22 +120,22 @@ int32_t tfm_ns_mailbox_hal_init(struct ns_mailbox_queue_t *queue)`
`121`	`120`
`122`	`121`	`void * tfm_ns_mailbox_hal_create_semaphore(void)`
`123`	`122`	`{`
`124`		`- return os_wrapper_semaphore_create(1, 0, NULL);`
	`123`	`+ return osSemaphoreNew(1, 0, NULL);`
`125`	`124`	`}`
`126`	`125`
`127`	`126`	`void tfm_ns_mailbox_hal_wait_reply(mailbox_msg_handle_t handle)`
`128`	`127`	`{`
`129`	`128`	`void *sem = tfm_ns_mailbox_get_msg_semaphore(handle);`
`130`	`129`	`if (sem != NULL) {`
`131`		`- os_wrapper_semaphore_acquire(sem, OS_WRAPPER_WAIT_FOREVER);`
	`130`	`+ osSemaphoreAcquire(sem, osWaitForever);`
`132`	`131`	`}`
`133`	`132`	`}`
`134`	`133`
`135`	`134`	`void tfm_ns_mailbox_hal_delete_semaphore(mailbox_msg_handle_t handle)`
`136`	`135`	`{`
`137`	`136`	`void *sem = tfm_ns_mailbox_get_msg_semaphore(handle);`
`138`	`137`	`if (sem != NULL) {`
`139`		`- os_wrapper_semaphore_delete(sem);`
	`138`	`+ osSemaphoreDelete(sem);`
`140`	`139`	`}`
`141`	`140`	`}`
`142`	`141`
`@@ -191,6 +190,10 @@ static cy_en_ipcsema_status_t mailbox_raw_spin_lock(uint32_t ipc_channel,`
`191`	`190`	`* notification event from secure core. However, it is more`
`192`	`191`	`* complex and requires more code and more modifications.`
`193`	`192`	`*/`
	`193`	`+ volatile uint32_t count = 1000;`
	`194`	`+ while(count > 0) {`
	`195`	`+ count--;`
	`196`	`+ }`
`194`	`197`	`Cy_IPC_Sema_Status(sema_num);`
`195`	`198`	`}`
`196`	`199`	`}`
`@@ -285,7 +288,7 @@ static bool mailbox_clear_intr(void)`
`285`	`288`	`return true;`
`286`	`289`	`}`
`287`	`290`
`288`		`-void tfm_ns_mailbox_ipc_IRQHandler(void)`
	`291`	`+void cpuss_interrupts_ipc_8_IRQHandler(void)`
`289`	`292`	`{`
`290`	`293`	`uint32_t magic;`
`291`	`294`	`mailbox_msg_handle_t handle;`
`@@ -306,9 +309,8 @@ void tfm_ns_mailbox_ipc_IRQHandler(void)`
`306`	`309`
`307`	`310`	`sem = (void *)tfm_ns_mailbox_get_msg_semaphore(handle);`
`308`	`311`	`if (sem) {`
`309`		`- yield \|= os_wrapper_semaphore_release_isr(sem);`
	`312`	`+ yield \|= osSemaphoreRelease(sem);`
`310`	`313`	`}`
`311`	`314`	`}`
`312`		`- os_wrapper_isr_yield(yield);`
`313`	`315`	`}`
`314`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@`
`8`	`8`	`#include <stdint.h>`
`9`	`9`	`#include <stdbool.h>`
`10`	`10`
`11`		`-#include "os_wrapper/mutex.h"`
`12`		`-`
`13`	`11`	`#include "psa/client.h"`
`14`	`12`	`#include "psa/error.h"`
`15`	`13`	`#include "tfm_api.h"`
`@@ -64,7 +62,7 @@ uint32_t psa_framework_version(void)`
`64`	`62`	`uint32_t version;`
`65`	`63`	`int32_t ret;`
`66`	`64`
`67`		`- if (tfm_ns_multi_core_lock_acquire() != OS_WRAPPER_SUCCESS) {`
	`65`	`+ if (tfm_ns_multi_core_lock_acquire() != 0) {`
`68`	`66`	`return PSA_VERSION_NONE;`
`69`	`67`	`}`
`70`	`68`
`@@ -82,7 +80,7 @@ uint32_t psa_framework_version(void)`
`82`	`80`	`version = PSA_VERSION_NONE;`
`83`	`81`	`}`
`84`	`82`
`85`		`- if (tfm_ns_multi_core_lock_release() != OS_WRAPPER_SUCCESS) {`
	`83`	`+ if (tfm_ns_multi_core_lock_release() != 0) {`
`86`	`84`	`return PSA_VERSION_NONE;`
`87`	`85`	`}`
`88`	`86`
`@@ -98,7 +96,7 @@ uint32_t psa_version(uint32_t sid)`
`98`	`96`
`99`	`97`	`params.psa_version_params.sid = sid;`
`100`	`98`
`101`		`- if (tfm_ns_multi_core_lock_acquire() != OS_WRAPPER_SUCCESS) {`
	`99`	`+ if (tfm_ns_multi_core_lock_acquire() != 0) {`
`102`	`100`	`return PSA_VERSION_NONE;`
`103`	`101`	`}`
`104`	`102`
`@@ -116,7 +114,7 @@ uint32_t psa_version(uint32_t sid)`
`116`	`114`	`version = PSA_VERSION_NONE;`
`117`	`115`	`}`
`118`	`116`
`119`		`- if (tfm_ns_multi_core_lock_release() != OS_WRAPPER_SUCCESS) {`
	`117`	`+ if (tfm_ns_multi_core_lock_release() != 0) {`
`120`	`118`	`return PSA_VERSION_NONE;`
`121`	`119`	`}`
`122`	`120`
`@@ -133,7 +131,7 @@ psa_handle_t psa_connect(uint32_t sid, uint32_t version)`
`133`	`131`	`params.psa_connect_params.sid = sid;`
`134`	`132`	`params.psa_connect_params.version = version;`
`135`	`133`
`136`		`- if (tfm_ns_multi_core_lock_acquire() != OS_WRAPPER_SUCCESS) {`
	`134`	`+ if (tfm_ns_multi_core_lock_acquire() != 0) {`
`137`	`135`	`return PSA_NULL_HANDLE;`
`138`	`136`	`}`
`139`	`137`
`@@ -151,7 +149,7 @@ psa_handle_t psa_connect(uint32_t sid, uint32_t version)`
`151`	`149`	`psa_handle = PSA_NULL_HANDLE;`
`152`	`150`	`}`
`153`	`151`
`154`		`- if (tfm_ns_multi_core_lock_release() != OS_WRAPPER_SUCCESS) {`
	`152`	`+ if (tfm_ns_multi_core_lock_release() != 0) {`
`155`	`153`	`return PSA_NULL_HANDLE;`
`156`	`154`	`}`
`157`	`155`
`@@ -174,7 +172,7 @@ psa_status_t psa_call(psa_handle_t handle, int32_t type,`
`174`	`172`	`params.psa_call_params.out_vec = out_vec;`
`175`	`173`	`params.psa_call_params.out_len = out_len;`
`176`	`174`
`177`		`- if (tfm_ns_multi_core_lock_acquire() != OS_WRAPPER_SUCCESS) {`
	`175`	`+ if (tfm_ns_multi_core_lock_acquire() != 0) {`
`178`	`176`	`return PSA_ERROR_GENERIC_ERROR;`
`179`	`177`	`}`
`180`	`178`
`@@ -192,7 +190,7 @@ psa_status_t psa_call(psa_handle_t handle, int32_t type,`
`192`	`190`	`status = PSA_INTER_CORE_COMM_ERR;`
`193`	`191`	`}`
`194`	`192`
`195`		`- if (tfm_ns_multi_core_lock_release() != OS_WRAPPER_SUCCESS) {`
	`193`	`+ if (tfm_ns_multi_core_lock_release() != 0) {`
`196`	`194`	`return PSA_ERROR_GENERIC_ERROR;`
`197`	`195`	`}`
`198`	`196`
`@@ -207,7 +205,7 @@ void psa_close(psa_handle_t handle)`
`207`	`205`
`208`	`206`	`params.psa_close_params.handle = handle;`
`209`	`207`
`210`		`- if (tfm_ns_multi_core_lock_acquire() != OS_WRAPPER_SUCCESS) {`
	`208`	`+ if (tfm_ns_multi_core_lock_acquire() != 0) {`
`211`	`209`	`return;`
`212`	`210`	`}`
`213`	`211`