Move current TFM to TFM_V1_1

Named TFM V1.1 as TFM_V1_1 instead of TFM_V1.1 as TFM_V1.1 is invalid
as macro name

Signed-off-by: Charley Chu <[email protected]>

Author: Charley Chu

features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/platform_multicore.c renamed to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/platform_multicore.c

@@ -54,7 +54,6 @@ int32_t tfm_ns_mailbox_hal_notify_peer(void)
 
 static int32_t mailbox_sema_init(void)
 {
-#if defined(CY_IPC_DEFAULT_CFG_DISABLE)
     /* semaphore data */
     static uint32_t tfm_sema __attribute__((section("TFM_SHARED_DATA")));
 
@@ -63,7 +62,6 @@ static int32_t mailbox_sema_init(void)
                          &tfm_sema) != CY_IPC_SEMA_SUCCESS) {
         return PLATFORM_MAILBOX_INIT_ERROR;
     }
-#endif
     return PLATFORM_MAILBOX_SUCCESS;
 }
 
@@ -120,7 +118,11 @@ int32_t tfm_ns_mailbox_hal_init(struct ns_mailbox_queue_t *queue)
 
 const void *tfm_ns_mailbox_get_task_handle(void)
 {
-    return osThreadGetId();;
+#ifdef TFM_MULTI_CORE_MULTI_CLIENT_CALL
+    return osThreadGetId();
+#else
+    return NULL;
+#endif
 }
 
 void tfm_ns_mailbox_hal_wait_reply(mailbox_msg_handle_t handle)
@@ -277,7 +279,7 @@ static bool mailbox_clear_intr(void)
     return true;
 }
 
-void cpuss_interrupts_ipc_8_IRQHandler(void)
+void cpuss_interrupts_ipc_5_IRQHandler(void)
 {
     uint32_t magic;
     mailbox_msg_handle_t handle;
@@ -297,6 +299,9 @@ void cpuss_interrupts_ipc_8_IRQHandler(void)
 
             task_handle = (osThreadId_t)tfm_ns_mailbox_get_msg_owner(handle);
             if (task_handle) {
+                /* According to the description of CMSIS-RTOS v2 Thread Flags,
+                 * osThreadFlagsSet() can be called inside Interrupt Service
+                 * Routine. */
                 osThreadFlagsSet(task_handle, handle);
             }
         }

features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/platform_ns_mailbox.c renamed to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/platform_ns_mailbox.c

@@ -9,22 +9,15 @@
 #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;
+static osSemaphoreId_t ns_lock_handle = NULL;
 
 __attribute__((weak))
 enum tfm_status_e tfm_ns_interface_init(void)
 {
-    osSemaphoreAttr_t sema_attrib = {
-        .name = "tfm_ns_lock",
-        .attr_bits = 0,
-        .cb_size = sizeof(tfm_ns_sema_obj),
-        .cb_mem = &tfm_ns_sema_obj
-    };
+    osSemaphoreAttr_t sema_attrib = {0};
 
     ns_lock_handle = osSemaphoreNew(MAX_SEMAPHORE_COUNT,
                                     MAX_SEMAPHORE_COUNT,

features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_mbed_boot.c renamed to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/tfm_mbed_boot.c

@@ -62,7 +62,7 @@ uint32_t psa_framework_version(void)
     uint32_t version;
     int32_t ret;
 
-    if (tfm_ns_multi_core_lock_acquire() != 0) {
+    if (tfm_ns_multi_core_lock_acquire() != TFM_SUCCESS) {
         return PSA_VERSION_NONE;
     }
 
@@ -80,7 +80,7 @@ uint32_t psa_framework_version(void)
         version = PSA_VERSION_NONE;
     }
 
-    if (tfm_ns_multi_core_lock_release() != 0) {
+    if (tfm_ns_multi_core_lock_release() != TFM_SUCCESS) {
         return PSA_VERSION_NONE;
     }
 
@@ -96,7 +96,7 @@ uint32_t psa_version(uint32_t sid)
 
     params.psa_version_params.sid = sid;
 
-    if (tfm_ns_multi_core_lock_acquire() != 0) {
+    if (tfm_ns_multi_core_lock_acquire() != TFM_SUCCESS) {
         return PSA_VERSION_NONE;
     }
 
@@ -114,7 +114,7 @@ uint32_t psa_version(uint32_t sid)
         version = PSA_VERSION_NONE;
     }
 
-    if (tfm_ns_multi_core_lock_release() != 0) {
+    if (tfm_ns_multi_core_lock_release() != TFM_SUCCESS) {
         return PSA_VERSION_NONE;
     }
 
@@ -131,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() != 0) {
+    if (tfm_ns_multi_core_lock_acquire() != TFM_SUCCESS) {
         return PSA_NULL_HANDLE;
     }
 
@@ -149,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() != 0) {
+    if (tfm_ns_multi_core_lock_release() != TFM_SUCCESS) {
         return PSA_NULL_HANDLE;
     }
 
@@ -172,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() != 0) {
+    if (tfm_ns_multi_core_lock_acquire() != TFM_SUCCESS) {
         return PSA_ERROR_GENERIC_ERROR;
     }
 
@@ -190,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() != 0) {
+    if (tfm_ns_multi_core_lock_release() != TFM_SUCCESS) {
         return PSA_ERROR_GENERIC_ERROR;
     }
 
@@ -205,7 +205,7 @@ void psa_close(psa_handle_t handle)
 
     params.psa_close_params.handle = handle;
 
-    if (tfm_ns_multi_core_lock_acquire() != 0) {
+    if (tfm_ns_multi_core_lock_acquire() != TFM_SUCCESS) {
         return;
     }
 

features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_multi_core_api.c renamed to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/tfm_multi_core_api.c

@@ -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 (8)
+#define IPC_PSA_CLIENT_REPLY_INTR_STRUCT (5)
 #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_8_IRQn
+#define IPC_PSA_CLIENT_REPLY_IPC_INTR    cpuss_interrupts_ipc_5_IRQn
 
 #define IPC_RX_RELEASE_MASK              (0)
 

features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_multi_core_psa_ns_api.c renamed to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/tfm_multi_core_psa_ns_api.c

@@ -61,10 +61,6 @@ extern "C" {
 #define SPM_CORE_TEST_INIT_SUCCESS_VERSION                         (1U)
 #define SPM_CORE_TEST_DIRECT_RECURSION_SID                         (0x0000F021U)
 #define SPM_CORE_TEST_DIRECT_RECURSION_VERSION                     (1U)
-#define SPM_CORE_TEST_MPU_ACCESS_SID                               (0x0000F022U)
-#define SPM_CORE_TEST_MPU_ACCESS_VERSION                           (1U)
-#define SPM_CORE_TEST_MEMORY_PERMISSIONS_SID                       (0x0000F023U)
-#define SPM_CORE_TEST_MEMORY_PERMISSIONS_VERSION                   (1U)
 #define SPM_CORE_TEST_SS_TO_SS_SID                                 (0x0000F024U)
 #define SPM_CORE_TEST_SS_TO_SS_VERSION                             (1U)
 #define SPM_CORE_TEST_SS_TO_SS_BUFFER_SID                          (0x0000F025U)

features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_ns_mailbox.c renamed to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/tfm_ns_mailbox.c

@@ -84,7 +84,6 @@ bool tfm_ns_mailbox_is_msg_replied(mailbox_msg_handle_t handle);
  */
 int32_t tfm_ns_mailbox_init(struct ns_mailbox_queue_t *queue);
 
-#ifdef TFM_MULTI_CORE_MULTI_CLIENT_CALL
 /**
  * \brief Get the handle of the current non-secure task executing mailbox
  *        functionalities
@@ -97,12 +96,6 @@ int32_t tfm_ns_mailbox_init(struct ns_mailbox_queue_t *queue);
  * \return Return the handle of task.
  */
 const void *tfm_ns_mailbox_get_task_handle(void);
-#else
-static inline const void *tfm_ns_mailbox_get_task_handle(void)
-{
-    return NULL;
-}
-#endif
 
 /**
  * \brief Fetch the handle to the first replied mailbox message in the NSPE

features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V8M/src/cmsis_nvic_virtual.c renamed to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_V8M/src/cmsis_nvic_virtual.c

@@ -135,6 +135,7 @@
         ],
         "extra_labels": [
             "TFM",
+            "TFM_V1_1",
             "TFM_V8M"
         ],
         "device_has": [