TF-M patch/workaround related to (TF-M issue #T240)

- Link to bug tracking: https://developer.trustedfirmware.org/T240

The issue is fixed by TF-M team. This work around allows existing stack
allocation in mbed-os for different partitions to be used with the fix

Signed-off-by: Devaraj Ranganna <[email protected]>

Author: urutva

components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/secure_fw/spm/spm_api.c

@@ -128,6 +128,10 @@ enum spm_err_t tfm_spm_db_init(void)
      * RW start address to psp_stack_bottom to get RW access to stack
      */
     part_ptr->memory_data.rw_start     = psp_stack_bottom;
+
+    part_ptr->stack_bottom = psp_stack_bottom;
+    part_ptr->stack_top = psp_stack_top;
+
 #endif
 
     part_ptr->runtime_data.partition_state = SPM_PARTITION_STATE_UNINIT;
@@ -205,12 +209,12 @@ enum spm_err_t tfm_spm_partition_init(void)
 uint32_t tfm_spm_partition_get_stack_bottom(uint32_t partition_idx)
 {
     return g_spm_partition_db.partitions[partition_idx].
-            memory_data.stack_bottom;
+            stack_bottom;
 }
 
 uint32_t tfm_spm_partition_get_stack_top(uint32_t partition_idx)
 {
-    return g_spm_partition_db.partitions[partition_idx].memory_data.stack_top;
+    return g_spm_partition_db.partitions[partition_idx].stack_top;
 }
 #endif
 
@@ -286,7 +290,6 @@ uint32_t tfm_spm_partition_get_flags(uint32_t partition_idx)
             partition_flags;
 }
 
-#ifndef TFM_PSA_API
 void tfm_spm_partition_store_context(uint32_t partition_idx,
         uint32_t stack_ptr, uint32_t lr)
 {
@@ -397,7 +400,6 @@ void tfm_spm_partition_cleanup_context(uint32_t partition_idx)
     partition->runtime_data.orig_outvec = 0;
     partition->runtime_data.iovec_api = 0;
 }
-#endif /* !defined(TFM_PSA_API) */
 
 __attribute__((section("SFN")))
 void tfm_spm_partition_change_privilege(uint32_t privileged)

components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/secure_fw/spm/spm_db.h

@@ -62,13 +62,18 @@ struct spm_partition_desc_t {
 #endif
 #ifdef TFM_PSA_API
     struct tfm_thrd_ctx sp_thrd;
+    /*
+     * stack_bottom points to starting address of the partitions' stack plus the partitions' stack top.
+     */
+    uint32_t stack_bottom;
+    uint32_t stack_top;
 #endif
 };
 
 /* Macros to pick linker symbols and allow to form the partition data base */
 #define REGION(a, b, c) a##b##c
 #define REGION_NAME(a, b, c) REGION(a, b, c)
-#if (TFM_LVL == 1) && !defined(TFM_PSA_API)
+#if (TFM_LVL == 1)
 #define REGION_DECLARE(a, b, c)
 #else
 #define REGION_DECLARE(a, b, c) extern uint32_t REGION_NAME(a, b, c)

components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/secure_fw/spm/spm_db_setup.h

@@ -38,7 +38,7 @@ struct spm_partition_db_t {
         data.partition_priority = TFM_PRIORITY(priority);                     \
     } while (0)
 
-#if (TFM_LVL == 1) && !defined(TFM_PSA_API)
+#if (TFM_LVL == 1)
 #define PARTITION_INIT_MEMORY_DATA(data, partition)
 #else
 #define PARTITION_INIT_MEMORY_DATA(data, partition)                            \
@@ -75,7 +75,7 @@ struct spm_partition_db_t {
     } while (0)
 #endif
 
-#define PARTITION_DECLARE(partition, flag, type, id, priority)               \
+#define PARTITION_DECLARE(partition, flag, type, id, priority, part_stack_size)   \
     do {                                                                     \
         REGION_DECLARE(Image$$, partition, $$Base);                          \
         REGION_DECLARE(Image$$, partition, $$Limit);                         \
@@ -101,8 +101,12 @@ struct spm_partition_db_t {
         if (g_spm_partition_db.partition_count >= SPM_MAX_PARTITIONS) {      \
             return SPM_ERR_INVALID_CONFIG;                                   \
         }                                                                    \
+        __attribute__((section(".data.partitions_stacks")))                  \
+        static uint8_t partition##_stack[part_stack_size] __attribute__((aligned(8))); \
         part_ptr = &(g_spm_partition_db.partitions[                          \
             g_spm_partition_db.partition_count]);                            \
+        part_ptr->stack_bottom = (uint32_t)partition##_stack;                \
+        part_ptr->stack_top = part_ptr->stack_bottom + part_stack_size;      \
         PARTITION_INIT_STATIC_DATA(part_ptr->static_data, partition, flags,  \
                                    id, priority);                            \
         PARTITION_INIT_RUNTIME_DATA(part_ptr->runtime_data, partition);      \