diff --git a/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_partition_defs.inc b/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_partition_defs.inc index f71e75da81..0cdcf01d85 100644 --- a/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_partition_defs.inc +++ b/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_partition_defs.inc @@ -22,10 +22,10 @@ /*************************** Service Partitions ******************************/ -#define ITS_ID (TFM_SP_BASE + 0) -#define PLATFORM_ID (TFM_SP_BASE + 1) -#define CRYPTO_SRV_ID (TFM_SP_BASE + 2) -#define ATTEST_SRV_ID (TFM_SP_BASE + 3) +#define ATTEST_SRV_ID (TFM_SP_BASE + 0) +#define CRYPTO_SRV_ID (TFM_SP_BASE + 1) +#define PLATFORM_ID (TFM_SP_BASE + 2) +#define ITS_ID (TFM_SP_BASE + 3) /*************************** Test Partitions *********************************/ @@ -59,4 +59,4 @@ #define TFM_MAX_USER_PARTITIONS (4) #endif -#endif // __TFM_PARTITION_DEFS_INC__ \ No newline at end of file +#endif // __TFM_PARTITION_DEFS_INC__ diff --git a/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_partition_list.inc b/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_partition_list.inc index 78e1ab3101..d0ad560a5b 100644 --- a/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_partition_list.inc +++ b/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_partition_list.inc @@ -10,17 +10,11 @@ #ifndef __TFM_PARTITION_LIST_INC__ #define __TFM_PARTITION_LIST_INC__ -/******** ITS ********/ -PARTITION_DECLARE(ITS, 0 +/******** ATTEST_SRV ********/ +PARTITION_DECLARE(ATTEST_SRV, 0 | SPM_PART_FLAG_IPC - , "APPLICATION-ROT", 10, NORMAL, 2048); -PARTITION_ADD_INIT_FUNC(ITS, its_entry); - -/******** PLATFORM ********/ -PARTITION_DECLARE(PLATFORM, 0 - | SPM_PART_FLAG_IPC - , "APPLICATION-ROT", 8, NORMAL, 1024); -PARTITION_ADD_INIT_FUNC(PLATFORM, platform_partition_entry); + , "APPLICATION-ROT", 37, NORMAL, 8192); +PARTITION_ADD_INIT_FUNC(ATTEST_SRV, attest_main); /******** CRYPTO_SRV ********/ PARTITION_DECLARE(CRYPTO_SRV, 0 @@ -28,11 +22,17 @@ PARTITION_DECLARE(CRYPTO_SRV, 0 , "APPLICATION-ROT", 35, NORMAL, 16384); PARTITION_ADD_INIT_FUNC(CRYPTO_SRV, crypto_main); -/******** ATTEST_SRV ********/ -PARTITION_DECLARE(ATTEST_SRV, 0 +/******** PLATFORM ********/ +PARTITION_DECLARE(PLATFORM, 0 | SPM_PART_FLAG_IPC - , "APPLICATION-ROT", 37, NORMAL, 8192); -PARTITION_ADD_INIT_FUNC(ATTEST_SRV, attest_main); + , "APPLICATION-ROT", 8, NORMAL, 1024); +PARTITION_ADD_INIT_FUNC(PLATFORM, platform_partition_entry); + +/******** ITS ********/ +PARTITION_DECLARE(ITS, 0 + | SPM_PART_FLAG_IPC + , "APPLICATION-ROT", 10, NORMAL, 2048); +PARTITION_ADD_INIT_FUNC(ITS, its_entry); #ifdef USE_PSA_TEST_PARTITIONS @@ -78,4 +78,4 @@ PARTITION_ADD_INIT_FUNC(SMOKE_TESTS_PART1, smoke_part_main); #endif // USE_PSA_TEST_PARTITIONS -#endif // __TFM_PARTITION_LIST_INC__ \ No newline at end of file +#endif // __TFM_PARTITION_LIST_INC__ diff --git a/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_service_list.inc b/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_service_list.inc index 8fa5fa61db..40e15b543b 100644 --- a/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_service_list.inc +++ b/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_service_list.inc @@ -10,17 +10,10 @@ #ifndef __TFM_SERVICE_LIST_INC__ #define __TFM_SERVICE_LIST_INC__ -/******** ITS ********/ -{"PSA_ITS_GET", ITS_ID, PSA_ITS_GET_MSK, 0x00011A00, true, 1, TFM_VERSION_POLICY_RELAXED}, -{"PSA_ITS_SET", ITS_ID, PSA_ITS_SET_MSK, 0x00011A01, true, 1, TFM_VERSION_POLICY_RELAXED}, -{"PSA_ITS_INFO", ITS_ID, PSA_ITS_INFO_MSK, 0x00011A02, true, 1, TFM_VERSION_POLICY_RELAXED}, -{"PSA_ITS_REMOVE", ITS_ID, PSA_ITS_REMOVE_MSK, 0x00011A03, true, 1, TFM_VERSION_POLICY_RELAXED}, -{"PSA_ITS_RESET", ITS_ID, PSA_ITS_RESET_MSK, 0x00011A04, false, 1, TFM_VERSION_POLICY_RELAXED}, - -/******** PLATFORM ********/ -{"PSA_PLATFORM_LC_GET", PLATFORM_ID, PSA_PLATFORM_LC_GET_MSK, 0x00011000, true, 1, TFM_VERSION_POLICY_RELAXED}, -{"PSA_PLATFORM_LC_SET", PLATFORM_ID, PSA_PLATFORM_LC_SET_MSK, 0x00011001, true, 1, TFM_VERSION_POLICY_RELAXED}, -{"PSA_PLATFORM_SYSTEM_RESET", PLATFORM_ID, PSA_PLATFORM_SYSTEM_RESET_MSK, 0x00011002, true, 1, TFM_VERSION_POLICY_RELAXED}, +/******** ATTEST_SRV ********/ +{"PSA_ATTEST_GET_TOKEN_ID", ATTEST_SRV_ID, PSA_ATTEST_GET_TOKEN, 0x00000F10, true, 1, TFM_VERSION_POLICY_STRICT}, +{"PSA_ATTEST_GET_TOKEN_SIZE_ID", ATTEST_SRV_ID, PSA_ATTEST_GET_TOKEN_SIZE, 0x00000F11, true, 1, TFM_VERSION_POLICY_STRICT}, +{"PSA_ATTEST_INJECT_KEY_ID", ATTEST_SRV_ID, PSA_ATTEST_INJECT_KEY, 0x00000F12, true, 1, TFM_VERSION_POLICY_STRICT}, /******** CRYPTO_SRV ********/ {"PSA_CRYPTO_INIT_ID", CRYPTO_SRV_ID, PSA_CRYPTO_INIT, 0x00000F00, true, 1, TFM_VERSION_POLICY_STRICT}, @@ -35,10 +28,17 @@ {"PSA_GENERATOR_ID", CRYPTO_SRV_ID, PSA_GENERATOR, 0x00000F09, true, 1, TFM_VERSION_POLICY_STRICT}, {"PSA_ENTROPY_ID", CRYPTO_SRV_ID, PSA_ENTROPY_INJECT, 0x00000F0A, true, 1, TFM_VERSION_POLICY_STRICT}, -/******** ATTEST_SRV ********/ -{"PSA_ATTEST_GET_TOKEN_ID", ATTEST_SRV_ID, PSA_ATTEST_GET_TOKEN, 0x00000F10, true, 1, TFM_VERSION_POLICY_STRICT}, -{"PSA_ATTEST_GET_TOKEN_SIZE_ID", ATTEST_SRV_ID, PSA_ATTEST_GET_TOKEN_SIZE, 0x00000F11, true, 1, TFM_VERSION_POLICY_STRICT}, -{"PSA_ATTEST_INJECT_KEY_ID", ATTEST_SRV_ID, PSA_ATTEST_INJECT_KEY, 0x00000F12, true, 1, TFM_VERSION_POLICY_STRICT}, +/******** PLATFORM ********/ +{"PSA_PLATFORM_LC_GET", PLATFORM_ID, PSA_PLATFORM_LC_GET_MSK, 0x00011000, true, 1, TFM_VERSION_POLICY_RELAXED}, +{"PSA_PLATFORM_LC_SET", PLATFORM_ID, PSA_PLATFORM_LC_SET_MSK, 0x00011001, true, 1, TFM_VERSION_POLICY_RELAXED}, +{"PSA_PLATFORM_SYSTEM_RESET", PLATFORM_ID, PSA_PLATFORM_SYSTEM_RESET_MSK, 0x00011002, true, 1, TFM_VERSION_POLICY_RELAXED}, + +/******** ITS ********/ +{"PSA_ITS_GET", ITS_ID, PSA_ITS_GET_MSK, 0x00011A00, true, 1, TFM_VERSION_POLICY_RELAXED}, +{"PSA_ITS_SET", ITS_ID, PSA_ITS_SET_MSK, 0x00011A01, true, 1, TFM_VERSION_POLICY_RELAXED}, +{"PSA_ITS_INFO", ITS_ID, PSA_ITS_INFO_MSK, 0x00011A02, true, 1, TFM_VERSION_POLICY_RELAXED}, +{"PSA_ITS_REMOVE", ITS_ID, PSA_ITS_REMOVE_MSK, 0x00011A03, true, 1, TFM_VERSION_POLICY_RELAXED}, +{"PSA_ITS_RESET", ITS_ID, PSA_ITS_RESET_MSK, 0x00011A04, false, 1, TFM_VERSION_POLICY_RELAXED}, #ifdef USE_PSA_TEST_PARTITIONS @@ -81,4 +81,4 @@ #endif // USE_PSA_TEST_PARTITIONS -#endif // __TFM_SERVICE_LIST_INC__ \ No newline at end of file +#endif // __TFM_SERVICE_LIST_INC__ diff --git a/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_spm_signal_defs.h b/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_spm_signal_defs.h index b5a0bd9881..ac26f55ea3 100644 --- a/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_spm_signal_defs.h +++ b/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_spm_signal_defs.h @@ -10,25 +10,13 @@ #ifndef __TFM_SPM_SIGNAL_DEFS_H__ #define __TFM_SPM_SIGNAL_DEFS_H__ -/******** ITS ********/ -#define PSA_ITS_GET_MSK_POS (4UL) -#define PSA_ITS_GET_MSK (1UL << PSA_ITS_GET_MSK_POS) -#define PSA_ITS_SET_MSK_POS (5UL) -#define PSA_ITS_SET_MSK (1UL << PSA_ITS_SET_MSK_POS) -#define PSA_ITS_INFO_MSK_POS (6UL) -#define PSA_ITS_INFO_MSK (1UL << PSA_ITS_INFO_MSK_POS) -#define PSA_ITS_REMOVE_MSK_POS (7UL) -#define PSA_ITS_REMOVE_MSK (1UL << PSA_ITS_REMOVE_MSK_POS) -#define PSA_ITS_RESET_MSK_POS (8UL) -#define PSA_ITS_RESET_MSK (1UL << PSA_ITS_RESET_MSK_POS) - -/******** PLATFORM ********/ -#define PSA_PLATFORM_LC_GET_MSK_POS (4UL) -#define PSA_PLATFORM_LC_GET_MSK (1UL << PSA_PLATFORM_LC_GET_MSK_POS) -#define PSA_PLATFORM_LC_SET_MSK_POS (5UL) -#define PSA_PLATFORM_LC_SET_MSK (1UL << PSA_PLATFORM_LC_SET_MSK_POS) -#define PSA_PLATFORM_SYSTEM_RESET_MSK_POS (6UL) -#define PSA_PLATFORM_SYSTEM_RESET_MSK (1UL << PSA_PLATFORM_SYSTEM_RESET_MSK_POS) +/******** ATTEST_SRV ********/ +#define PSA_ATTEST_GET_TOKEN_POS (4UL) +#define PSA_ATTEST_GET_TOKEN (1UL << PSA_ATTEST_GET_TOKEN_POS) +#define PSA_ATTEST_GET_TOKEN_SIZE_POS (5UL) +#define PSA_ATTEST_GET_TOKEN_SIZE (1UL << PSA_ATTEST_GET_TOKEN_SIZE_POS) +#define PSA_ATTEST_INJECT_KEY_POS (6UL) +#define PSA_ATTEST_INJECT_KEY (1UL << PSA_ATTEST_INJECT_KEY_POS) /******** CRYPTO_SRV ********/ #define PSA_CRYPTO_INIT_POS (4UL) @@ -54,13 +42,25 @@ #define PSA_ENTROPY_INJECT_POS (14UL) #define PSA_ENTROPY_INJECT (1UL << PSA_ENTROPY_INJECT_POS) -/******** ATTEST_SRV ********/ -#define PSA_ATTEST_GET_TOKEN_POS (4UL) -#define PSA_ATTEST_GET_TOKEN (1UL << PSA_ATTEST_GET_TOKEN_POS) -#define PSA_ATTEST_GET_TOKEN_SIZE_POS (5UL) -#define PSA_ATTEST_GET_TOKEN_SIZE (1UL << PSA_ATTEST_GET_TOKEN_SIZE_POS) -#define PSA_ATTEST_INJECT_KEY_POS (6UL) -#define PSA_ATTEST_INJECT_KEY (1UL << PSA_ATTEST_INJECT_KEY_POS) +/******** PLATFORM ********/ +#define PSA_PLATFORM_LC_GET_MSK_POS (4UL) +#define PSA_PLATFORM_LC_GET_MSK (1UL << PSA_PLATFORM_LC_GET_MSK_POS) +#define PSA_PLATFORM_LC_SET_MSK_POS (5UL) +#define PSA_PLATFORM_LC_SET_MSK (1UL << PSA_PLATFORM_LC_SET_MSK_POS) +#define PSA_PLATFORM_SYSTEM_RESET_MSK_POS (6UL) +#define PSA_PLATFORM_SYSTEM_RESET_MSK (1UL << PSA_PLATFORM_SYSTEM_RESET_MSK_POS) + +/******** ITS ********/ +#define PSA_ITS_GET_MSK_POS (4UL) +#define PSA_ITS_GET_MSK (1UL << PSA_ITS_GET_MSK_POS) +#define PSA_ITS_SET_MSK_POS (5UL) +#define PSA_ITS_SET_MSK (1UL << PSA_ITS_SET_MSK_POS) +#define PSA_ITS_INFO_MSK_POS (6UL) +#define PSA_ITS_INFO_MSK (1UL << PSA_ITS_INFO_MSK_POS) +#define PSA_ITS_REMOVE_MSK_POS (7UL) +#define PSA_ITS_REMOVE_MSK (1UL << PSA_ITS_REMOVE_MSK_POS) +#define PSA_ITS_RESET_MSK_POS (8UL) +#define PSA_ITS_RESET_MSK (1UL << PSA_ITS_RESET_MSK_POS) #ifdef USE_PSA_TEST_PARTITIONS @@ -120,4 +120,4 @@ #endif // USE_PSA_TEST_PARTITIONS -#endif // __TFM_SPM_SIGNAL_DEFS_H__ \ No newline at end of file +#endif // __TFM_SPM_SIGNAL_DEFS_H__ diff --git a/components/TARGET_PSA/inc/psa_manifest/sid.h b/components/TARGET_PSA/inc/psa_manifest/sid.h index 5d5b2165c8..7fc1e5de09 100644 --- a/components/TARGET_PSA/inc/psa_manifest/sid.h +++ b/components/TARGET_PSA/inc/psa_manifest/sid.h @@ -17,17 +17,10 @@ /*********** WARNING: This is an auto-generated file. Do not edit! ***********/ -/******** ITS ********/ -#define PSA_ITS_GET 0x00011A00 -#define PSA_ITS_SET 0x00011A01 -#define PSA_ITS_INFO 0x00011A02 -#define PSA_ITS_REMOVE 0x00011A03 -#define PSA_ITS_RESET 0x00011A04 - -/******** PLATFORM ********/ -#define PSA_PLATFORM_LC_GET 0x00011000 -#define PSA_PLATFORM_LC_SET 0x00011001 -#define PSA_PLATFORM_SYSTEM_RESET 0x00011002 +/******** ATTEST_SRV ********/ +#define PSA_ATTEST_GET_TOKEN_ID 0x00000F10 +#define PSA_ATTEST_GET_TOKEN_SIZE_ID 0x00000F11 +#define PSA_ATTEST_INJECT_KEY_ID 0x00000F12 /******** CRYPTO_SRV ********/ #define PSA_CRYPTO_INIT_ID 0x00000F00 @@ -42,10 +35,17 @@ #define PSA_GENERATOR_ID 0x00000F09 #define PSA_ENTROPY_ID 0x00000F0A -/******** ATTEST_SRV ********/ -#define PSA_ATTEST_GET_TOKEN_ID 0x00000F10 -#define PSA_ATTEST_GET_TOKEN_SIZE_ID 0x00000F11 -#define PSA_ATTEST_INJECT_KEY_ID 0x00000F12 +/******** PLATFORM ********/ +#define PSA_PLATFORM_LC_GET 0x00011000 +#define PSA_PLATFORM_LC_SET 0x00011001 +#define PSA_PLATFORM_SYSTEM_RESET 0x00011002 + +/******** ITS ********/ +#define PSA_ITS_GET 0x00011A00 +#define PSA_ITS_SET 0x00011A01 +#define PSA_ITS_INFO 0x00011A02 +#define PSA_ITS_REMOVE 0x00011A03 +#define PSA_ITS_RESET 0x00011A04