commit 172f1e3bec1d623a72c61b7c476d8c217a544583
author Ken Liu <Ken.Liu@arm.com> Fri Feb 05 16:31:03 2021 +0800
committer Ken Liu <ken.liu@arm.com> Mon Feb 08 05:18:19 2021 +0000
tree 328a4496a7f065bda2295e4319768f890515365b
parent 7d6d9c0924a9487d4690380c455be1d3ff70c1df

SPM: Change partition platform data binding

- Rename the long name 'tfm_spm_partition_platform_data_t'
  to 'platform_data_t'.
- Platform data list is now part of partition static data.
- Update related init logic related to this name and position
  change.

Change-Id: I1676f35b53f9c3074a70ab4fb68673a347bd422f
Signed-off-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 983d5d4..177268c 100644
--- a/secure_fw/spm/cmsis_psa/spm_ipc.c
+++ b/secure_fw/spm/cmsis_psa/spm_ipc.c
@@ -640,7 +640,7 @@
     uint32_t i, j, num;
     struct partition_t *partition;
     struct tfm_core_thread_t *pth, *p_ns_entry_thread = NULL;
-    const struct tfm_spm_partition_platform_data_t **platform_data_p;
+    const struct platform_data_t **platform_data_p;
 
     tfm_pool_init(conn_handle_pool,
                   POOL_BUFFER_SIZE(conn_handle_pool),
@@ -666,7 +666,8 @@
             continue;
         }
 
-        platform_data_p = partition->platform_data_list;
+        platform_data_p =
+            (const struct platform_data_t **)partition->p_static->platform_data;
         if (platform_data_p != NULL) {
             while ((*platform_data_p) != NULL) {
                 if (tfm_spm_hal_configure_default_isolation(i,
@@ -1016,8 +1017,6 @@
 
     for (i = 0; i < g_spm_partition_db.partition_count; i++) {
         g_spm_partition_db.partitions[i].p_static = &static_data_list[i];
-        g_spm_partition_db.partitions[i].platform_data_list =
-                                                     platform_data_list_list[i];
         g_spm_partition_db.partitions[i].memory_data = &memory_data_list[i];
     }
     g_spm_partition_db.is_init = 1;