aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Shan <Shawn.Shan@arm.com>2020-09-24 16:33:05 +0800
committerShawn Shan <Shawn.Shan@arm.com>2020-10-13 11:13:45 +0800
commitd6cea55b4bf95344cb2cede1b4b88d9afdb5ea6a (patch)
treeffa0ae660149f7c0bf2add45f80e92eb9af6516f
parent4f8cdc058a1db237a60e2c83c26cb933ee6bcd85 (diff)
downloadtrusted-firmware-m-feature-isolation-level3.tar.gz
Test: Add a negative test case for level 3 in tf-m part.feature-isolation-level3
Add generated files related with the negative isolation level 3 test in tf-m part. Add definition of TFM_IPC_ISOLATION_3_RETRIEVE_APP_MEM to enable this negative test case. Change-Id: I048c036e6f259bda42791fa7cce6e95898a3adb8 Signed-off-by: Shawn Shan <Shawn.Shan@arm.com>
-rw-r--r--interface/include/psa_manifest/sid.h2
-rw-r--r--secure_fw/partitions/tfm_service_list.inc15
-rw-r--r--secure_fw/spm/cmsis_func/tfm_spm_db_func.inc3
-rw-r--r--secure_fw/spm/cmsis_psa/tfm_spm_db_ipc.inc3
4 files changed, 21 insertions, 2 deletions
diff --git a/interface/include/psa_manifest/sid.h b/interface/include/psa_manifest/sid.h
index 87d6186be..92b45919a 100644
--- a/interface/include/psa_manifest/sid.h
+++ b/interface/include/psa_manifest/sid.h
@@ -119,6 +119,8 @@ extern "C" {
#define IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM_VERSION (1U)
#define IPC_CLIENT_TEST_MEM_CHECK_SID (0x0000F064U)
#define IPC_CLIENT_TEST_MEM_CHECK_VERSION (1U)
+#define IPC_CLIENT_TEST_RETRIEVE_APP_MEM_SID (0x0000F065U)
+#define IPC_CLIENT_TEST_RETRIEVE_APP_MEM_VERSION (1U)
/******** TFM_IRQ_TEST_1 ********/
#define SPM_CORE_IRQ_TEST_1_PREPARE_TEST_SCENARIO_SID (0x0000F0A0U)
diff --git a/secure_fw/partitions/tfm_service_list.inc b/secure_fw/partitions/tfm_service_list.inc
index 3b777c6bf..398015461 100644
--- a/secure_fw/partitions/tfm_service_list.inc
+++ b/secure_fw/partitions/tfm_service_list.inc
@@ -452,6 +452,15 @@ const struct tfm_spm_service_db_t service_db[] =
.version = 1,
.version_policy = TFM_VERSION_POLICY_STRICT
},
+ {
+ .name = "IPC_CLIENT_TEST_RETRIEVE_APP_MEM",
+ .partition_id = TFM_SP_IPC_CLIENT_TEST,
+ .signal = IPC_CLIENT_TEST_RETRIEVE_APP_MEM_SIGNAL,
+ .sid = 0x0000F065,
+ .non_secure_client = true,
+ .version = 1,
+ .version_policy = TFM_VERSION_POLICY_STRICT
+ },
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_ENABLE_IRQ_TEST
@@ -805,6 +814,12 @@ struct tfm_spm_service_t service[] =
.handle_list = {0},
.list = {0},
},
+ {
+ .service_db = NULL,
+ .partition = NULL,
+ .handle_list = {0},
+ .list = {0},
+ },
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_ENABLE_IRQ_TEST
diff --git a/secure_fw/spm/cmsis_func/tfm_spm_db_func.inc b/secure_fw/spm/cmsis_func/tfm_spm_db_func.inc
index 369ef41dc..3c641b2a6 100644
--- a/secure_fw/spm/cmsis_func/tfm_spm_db_func.inc
+++ b/secure_fw/spm/cmsis_func/tfm_spm_db_func.inc
@@ -393,6 +393,7 @@ static int32_t dependencies_TFM_SP_IPC_CLIENT_TEST[] =
IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM_SID,
IPC_SERVICE_TEST_BASIC_SID,
IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM_SID,
+ TFM_SECURE_CLIENT_2_SID,
};
#endif /* TFM_PARTITION_TEST_CORE_IPC */
@@ -566,7 +567,7 @@ const struct spm_partition_static_data_t static_data_list[] =
,
.partition_priority = TFM_PRIORITY(NORMAL),
.partition_init = ipc_client_test_main,
- .dependencies_num = 4,
+ .dependencies_num = 5,
.p_dependencies = dependencies_TFM_SP_IPC_CLIENT_TEST,
},
#endif /* TFM_PARTITION_TEST_CORE_IPC */
diff --git a/secure_fw/spm/cmsis_psa/tfm_spm_db_ipc.inc b/secure_fw/spm/cmsis_psa/tfm_spm_db_ipc.inc
index 755d905cb..4a311628d 100644
--- a/secure_fw/spm/cmsis_psa/tfm_spm_db_ipc.inc
+++ b/secure_fw/spm/cmsis_psa/tfm_spm_db_ipc.inc
@@ -321,6 +321,7 @@ static uint32_t dependencies_TFM_SP_IPC_CLIENT_TEST[] =
IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM_SID,
IPC_SERVICE_TEST_BASIC_SID,
IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM_SID,
+ TFM_SECURE_CLIENT_2_SID,
};
#endif /* TFM_PARTITION_TEST_CORE_IPC */
@@ -507,7 +508,7 @@ const struct partition_static_t static_data_list[] =
,
.partition_priority = TFM_PRIORITY(NORMAL),
.partition_init = ipc_client_test_main,
- .dependencies_num = 4,
+ .dependencies_num = 5,
.p_dependencies = dependencies_TFM_SP_IPC_CLIENT_TEST,
},
#endif /* TFM_PARTITION_TEST_CORE_IPC */