From badfa189d67da24ac6f62f05cc86e6060b065fce Mon Sep 17 00:00:00 2001 From: Charley Chu Date: Fri, 17 Jul 2020 12:27:37 -0700 Subject: [PATCH] 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 --- .../TARGET_TFM_DUALCPU/src/platform_multicore.c | 0 .../TARGET_TFM_DUALCPU/src/platform_ns_mailbox.c | 13 +++++++++---- .../TARGET_TFM_DUALCPU/src/tfm_mbed_boot.c | 0 .../TARGET_TFM_DUALCPU/src/tfm_multi_core_api.c | 11 ++--------- .../src/tfm_multi_core_psa_ns_api.c | 0 .../TARGET_TFM_DUALCPU/src/tfm_ns_mailbox.c | 0 .../TARGET_TFM_V8M/src/cmsis_nvic_virtual.c | 0 .../TARGET_TFM_V8M/src/tfm_mbed_boot.c | 0 .../TARGET_TFM_V8M/src/tfm_ns_interface.c | 0 .../TARGET_TFM_V8M/src/tfm_psa_ns_api.c | 0 .../TARGET_TFM/{ => TARGET_TFM_V1_1}/VERSION.txt | 0 .../include/cmsis_nvic_virtual.h | 0 .../{ => TARGET_TFM_V1_1}/include/ns_ipc_config.h | 0 .../include/platform_multicore.h | 4 ++-- .../{ => TARGET_TFM_V1_1}/include/psa/client.h | 0 .../{ => TARGET_TFM_V1_1}/include/psa/crypto.h | 0 .../include/psa/crypto_client_struct.h | 0 .../include/psa/crypto_compat.h | 0 .../include/psa/crypto_extra.h | 0 .../include/psa/crypto_platform.h | 0 .../include/psa/crypto_sizes.h | 0 .../include/psa/crypto_struct.h | 0 .../include/psa/crypto_types.h | 0 .../include/psa/crypto_values.h | 0 .../{ => TARGET_TFM_V1_1}/include/psa/error.h | 0 .../include/psa/initial_attestation.h | 0 .../include/psa/internal_trusted_storage.h | 0 .../include/psa/protected_storage.h | 0 .../include/psa/storage_common.h | 0 .../include/psa_manifest/sid.h | 0 .../{ => TARGET_TFM_V1_1}/include/tfm_api.h | 0 .../{ => TARGET_TFM_V1_1}/include/tfm_crypto_defs.h | 0 .../{ => TARGET_TFM_V1_1}/include/tfm_mailbox.h | 0 .../include/tfm_multi_core_api.h | 0 .../include/tfm_ns_interface.h | 0 .../{ => TARGET_TFM_V1_1}/include/tfm_ns_mailbox.h | 7 ------- .../{ => TARGET_TFM_V1_1}/include/tfm_ns_svc.h | 0 .../include/tfm_platform_api.h | 0 .../{ => TARGET_TFM_V1_1}/include/tfm_veneers.h | 0 .../{ => TARGET_TFM_V1_1}/src/tfm_crypto_ipc_api.c | 0 .../src/tfm_initial_attestation_ipc_api.c | 0 .../{ => TARGET_TFM_V1_1}/src/tfm_its_ipc_api.c | 0 .../src/tfm_platform_ipc_api.c | 0 .../{ => TARGET_TFM_V1_1}/src/tfm_ps_ipc_api.c | 0 targets/targets.json | 1 + 45 files changed, 14 insertions(+), 22 deletions(-) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/TARGET_TFM_DUALCPU/src/platform_multicore.c (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/TARGET_TFM_DUALCPU/src/platform_ns_mailbox.c (96%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/TARGET_TFM_DUALCPU/src/tfm_mbed_boot.c (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/TARGET_TFM_DUALCPU/src/tfm_multi_core_api.c (75%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/TARGET_TFM_DUALCPU/src/tfm_multi_core_psa_ns_api.c (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/TARGET_TFM_DUALCPU/src/tfm_ns_mailbox.c (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/TARGET_TFM_V8M/src/cmsis_nvic_virtual.c (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/TARGET_TFM_V8M/src/tfm_mbed_boot.c (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/TARGET_TFM_V8M/src/tfm_ns_interface.c (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/TARGET_TFM_V8M/src/tfm_psa_ns_api.c (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/VERSION.txt (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/cmsis_nvic_virtual.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/ns_ipc_config.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/platform_multicore.h (96%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/client.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/crypto.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/crypto_client_struct.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/crypto_compat.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/crypto_extra.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/crypto_platform.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/crypto_sizes.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/crypto_struct.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/crypto_types.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/crypto_values.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/error.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/initial_attestation.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/internal_trusted_storage.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/protected_storage.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa/storage_common.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/psa_manifest/sid.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/tfm_api.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/tfm_crypto_defs.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/tfm_mailbox.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/tfm_multi_core_api.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/tfm_ns_interface.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/tfm_ns_mailbox.h (98%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/tfm_ns_svc.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/tfm_platform_api.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/include/tfm_veneers.h (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/src/tfm_crypto_ipc_api.c (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/src/tfm_initial_attestation_ipc_api.c (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/src/tfm_its_ipc_api.c (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/src/tfm_platform_ipc_api.c (100%) rename features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/{ => TARGET_TFM_V1_1}/src/tfm_ps_ipc_api.c (100%) diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/platform_multicore.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/platform_multicore.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/platform_multicore.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/platform_multicore.c 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_V1_1/TARGET_TFM_DUALCPU/src/platform_ns_mailbox.c similarity index 96% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/platform_ns_mailbox.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/platform_ns_mailbox.c index 3c642c0224..af08ac1a39 100644 --- 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_V1_1/TARGET_TFM_DUALCPU/src/platform_ns_mailbox.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); } } diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_mbed_boot.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/tfm_mbed_boot.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_mbed_boot.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/tfm_mbed_boot.c 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_V1_1/TARGET_TFM_DUALCPU/src/tfm_multi_core_api.c similarity index 75% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_multi_core_api.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/tfm_multi_core_api.c index 231e895b61..b58738feb3 100644 --- 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_V1_1/TARGET_TFM_DUALCPU/src/tfm_multi_core_api.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, 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_V1_1/TARGET_TFM_DUALCPU/src/tfm_multi_core_psa_ns_api.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_multi_core_psa_ns_api.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/tfm_multi_core_psa_ns_api.c diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_ns_mailbox.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/tfm_ns_mailbox.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_DUALCPU/src/tfm_ns_mailbox.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_DUALCPU/src/tfm_ns_mailbox.c diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V8M/src/cmsis_nvic_virtual.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_V8M/src/cmsis_nvic_virtual.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V8M/src/cmsis_nvic_virtual.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_V8M/src/cmsis_nvic_virtual.c diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V8M/src/tfm_mbed_boot.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_V8M/src/tfm_mbed_boot.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V8M/src/tfm_mbed_boot.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_V8M/src/tfm_mbed_boot.c diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V8M/src/tfm_ns_interface.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_V8M/src/tfm_ns_interface.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V8M/src/tfm_ns_interface.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_V8M/src/tfm_ns_interface.c diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V8M/src/tfm_psa_ns_api.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_V8M/src/tfm_psa_ns_api.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V8M/src/tfm_psa_ns_api.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/TARGET_TFM_V8M/src/tfm_psa_ns_api.c diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/VERSION.txt b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/VERSION.txt similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/VERSION.txt rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/VERSION.txt diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/cmsis_nvic_virtual.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/cmsis_nvic_virtual.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/cmsis_nvic_virtual.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/cmsis_nvic_virtual.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/ns_ipc_config.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/ns_ipc_config.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/ns_ipc_config.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/ns_ipc_config.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/platform_multicore.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/platform_multicore.h similarity index 96% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/platform_multicore.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/platform_multicore.h index d0d72d4d29..f90fb1e279 100644 --- a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/platform_multicore.h +++ b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/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 (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) diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/client.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/client.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/client.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/client.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_client_struct.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_client_struct.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_client_struct.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_client_struct.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_compat.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_compat.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_compat.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_compat.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_extra.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_extra.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_extra.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_extra.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_platform.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_platform.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_platform.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_platform.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_sizes.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_sizes.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_sizes.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_sizes.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_struct.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_struct.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_struct.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_struct.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_types.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_types.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_types.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_types.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_values.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_values.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_values.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/crypto_values.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/error.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/error.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/error.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/error.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/initial_attestation.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/initial_attestation.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/initial_attestation.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/initial_attestation.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/internal_trusted_storage.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/internal_trusted_storage.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/internal_trusted_storage.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/internal_trusted_storage.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/protected_storage.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/protected_storage.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/protected_storage.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/protected_storage.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/storage_common.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/storage_common.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/storage_common.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa/storage_common.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa_manifest/sid.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa_manifest/sid.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa_manifest/sid.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/psa_manifest/sid.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_api.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_api.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_api.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_api.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_crypto_defs.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_crypto_defs.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_crypto_defs.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_crypto_defs.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_mailbox.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_mailbox.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_mailbox.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_mailbox.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_multi_core_api.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_multi_core_api.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_multi_core_api.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_multi_core_api.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_ns_interface.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_ns_interface.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_ns_interface.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_ns_interface.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_ns_mailbox.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_ns_mailbox.h similarity index 98% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_ns_mailbox.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_ns_mailbox.h index ba902aa977..2fcb1b6470 100644 --- a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_ns_mailbox.h +++ b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_ns_mailbox.h @@ -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 diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_ns_svc.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_ns_svc.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_ns_svc.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_ns_svc.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_platform_api.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_platform_api.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_platform_api.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_platform_api.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_veneers.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_veneers.h similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/tfm_veneers.h rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/include/tfm_veneers.h diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/src/tfm_crypto_ipc_api.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/src/tfm_crypto_ipc_api.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/src/tfm_crypto_ipc_api.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/src/tfm_crypto_ipc_api.c diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/src/tfm_initial_attestation_ipc_api.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/src/tfm_initial_attestation_ipc_api.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/src/tfm_initial_attestation_ipc_api.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/src/tfm_initial_attestation_ipc_api.c diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/src/tfm_its_ipc_api.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/src/tfm_its_ipc_api.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/src/tfm_its_ipc_api.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/src/tfm_its_ipc_api.c diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/src/tfm_platform_ipc_api.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/src/tfm_platform_ipc_api.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/src/tfm_platform_ipc_api.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/src/tfm_platform_ipc_api.c diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/src/tfm_ps_ipc_api.c b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/src/tfm_ps_ipc_api.c similarity index 100% rename from features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/src/tfm_ps_ipc_api.c rename to features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_1/src/tfm_ps_ipc_api.c diff --git a/targets/targets.json b/targets/targets.json index 4667ead2c2..f52896d0c6 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -135,6 +135,7 @@ ], "extra_labels": [ "TFM", + "TFM_V1_1", "TFM_V8M" ], "device_has": [