From 3c0c5759bf709583b905687cf3d7c0b833619bda Mon Sep 17 00:00:00 2001 From: Michael Schwarcz Date: Fri, 1 Mar 2019 09:40:45 +0200 Subject: [PATCH] Regenerate mbed-spm files --- .../COMPONENT_SPE/psa_setup.c | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/TESTS/psa/crypto_access_control/COMPONENT_SPE/psa_setup.c b/TESTS/psa/crypto_access_control/COMPONENT_SPE/psa_setup.c index 7097cd5945..4b2bea8635 100644 --- a/TESTS/psa/crypto_access_control/COMPONENT_SPE/psa_setup.c +++ b/TESTS/psa/crypto_access_control/COMPONENT_SPE/psa_setup.c @@ -28,15 +28,17 @@ #include "handles_manager.h" #include "cmsis.h" #include "psa_test_partition_partition.h" +#include "psa_attest_srv_partition.h" #include "psa_crypto_srv_partition.h" #include "psa_platform_partition.h" #include "psa_its_partition.h" extern const uint32_t test_partition_external_sids[1]; +extern const uint32_t attest_srv_external_sids[7]; extern const uint32_t crypto_srv_external_sids[4]; extern const uint32_t platform_external_sids[1]; -spm_partition_t g_partitions[4] = { +spm_partition_t g_partitions[5] = { { .partition_id = TEST_PARTITION_ID, .thread_id = 0, @@ -48,6 +50,17 @@ spm_partition_t g_partitions[4] = { .extern_sids_count = TEST_PARTITION_EXT_ROT_SRV_COUNT, .irq_mapper = NULL, }, + { + .partition_id = ATTEST_SRV_ID, + .thread_id = 0, + .flags_rot_srv = ATTEST_SRV_WAIT_ANY_SID_MSK, + .flags_interrupts = 0, + .rot_services = NULL, + .rot_services_count = ATTEST_SRV_ROT_SRV_COUNT, + .extern_sids = attest_srv_external_sids, + .extern_sids_count = ATTEST_SRV_EXT_ROT_SRV_COUNT, + .irq_mapper = NULL, + }, { .partition_id = CRYPTO_SRV_ID, .thread_id = 0, @@ -92,6 +105,7 @@ const uint32_t mem_region_count = 0; // forward declaration of partition initializers void test_partition_init(spm_partition_t *partition); +void attest_srv_init(spm_partition_t *partition); void crypto_srv_init(spm_partition_t *partition); void platform_init(spm_partition_t *partition); void its_init(spm_partition_t *partition); @@ -103,11 +117,12 @@ uint32_t init_partitions(spm_partition_t **partitions) } test_partition_init(&(g_partitions[0])); - crypto_srv_init(&(g_partitions[1])); - platform_init(&(g_partitions[2])); - its_init(&(g_partitions[3])); + attest_srv_init(&(g_partitions[1])); + crypto_srv_init(&(g_partitions[2])); + platform_init(&(g_partitions[3])); + its_init(&(g_partitions[4])); *partitions = g_partitions; - return 4; + return 5; }