ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix dependencies of platform partition

pull/9702/head
Oren Cohen 2019-02-13 12:01:31 +02:00
parent a477354292
commit 45c44eb07c
7 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TESTS/psa/spm_client/COMPONENT_SPE/psa_setup.c
View File

@ -33,6 +33,7 @@
#include "psa_its_partition.h" #include "psa_its_partition.h"
extern const uint32_t crypto_srv_external_sids[4]; 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[4] = {
{ {
@ -64,7 +65,7 @@ spm_partition_t g_partitions[4] = {
.flags_interrupts = 0, .flags_interrupts = 0,
.rot_services = NULL, .rot_services = NULL,
.rot_services_count = PLATFORM_ROT_SRV_COUNT, .rot_services_count = PLATFORM_ROT_SRV_COUNT,
.extern_sids = NULL, .extern_sids = platform_external_sids,
.extern_sids_count = PLATFORM_EXT_ROT_SRV_COUNT, .extern_sids_count = PLATFORM_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL, .irq_mapper = NULL,
}, },

3
TESTS/psa/spm_server/COMPONENT_SPE/psa_setup.c
View File

@ -35,6 +35,7 @@
extern const uint32_t server_test_part1_external_sids[2]; extern const uint32_t server_test_part1_external_sids[2];
extern const uint32_t crypto_srv_external_sids[4]; extern const uint32_t crypto_srv_external_sids[4];
extern const uint32_t platform_external_sids[1];
spm_partition_t g_partitions[5] = { spm_partition_t g_partitions[5] = {
{ {
@ -77,7 +78,7 @@ spm_partition_t g_partitions[5] = {
.flags_interrupts = 0, .flags_interrupts = 0,
.rot_services = NULL, .rot_services = NULL,
.rot_services_count = PLATFORM_ROT_SRV_COUNT, .rot_services_count = PLATFORM_ROT_SRV_COUNT,
.extern_sids = NULL, .extern_sids = platform_external_sids,
.extern_sids_count = PLATFORM_EXT_ROT_SRV_COUNT, .extern_sids_count = PLATFORM_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL, .irq_mapper = NULL,
}, },

3
TESTS/psa/spm_smoke/COMPONENT_SPE/psa_setup.c
View File

@ -33,6 +33,7 @@
#include "psa_its_partition.h" #include "psa_its_partition.h"
extern const uint32_t crypto_srv_external_sids[4]; 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[4] = {
{ {
@ -64,7 +65,7 @@ spm_partition_t g_partitions[4] = {
.flags_interrupts = 0, .flags_interrupts = 0,
.rot_services = NULL, .rot_services = NULL,
.rot_services_count = PLATFORM_ROT_SRV_COUNT, .rot_services_count = PLATFORM_ROT_SRV_COUNT,
.extern_sids = NULL, .extern_sids = platform_external_sids,
.extern_sids_count = PLATFORM_EXT_ROT_SRV_COUNT, .extern_sids_count = PLATFORM_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL, .irq_mapper = NULL,
}, },

3
components/TARGET_PSA/TARGET_MBED_SPM/COMPONENT_SPE/psa_setup.c
View File

@ -32,6 +32,7 @@
#include "psa_its_partition.h" #include "psa_its_partition.h"
extern const uint32_t crypto_srv_external_sids[4]; extern const uint32_t crypto_srv_external_sids[4];
extern const uint32_t platform_external_sids[1];
__attribute__((weak)) __attribute__((weak))
spm_partition_t g_partitions[3] = { spm_partition_t g_partitions[3] = {
@ -53,7 +54,7 @@ spm_partition_t g_partitions[3] = {
.flags_interrupts = 0, .flags_interrupts = 0,
.rot_services = NULL, .rot_services = NULL,
.rot_services_count = PLATFORM_ROT_SRV_COUNT, .rot_services_count = PLATFORM_ROT_SRV_COUNT,
.extern_sids = NULL, .extern_sids = platform_external_sids,
.extern_sids_count = PLATFORM_EXT_ROT_SRV_COUNT, .extern_sids_count = PLATFORM_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL, .irq_mapper = NULL,
}, },

5
components/TARGET_PSA/services/platform/COMPONENT_SPE/TARGET_MBED_SPM/psa_platform_partition.c
View File

@ -30,6 +30,7 @@
#include "spm_internal.h" #include "spm_internal.h"
#include "psa_platform_partition.h" #include "psa_platform_partition.h"
#include "psa_platform_ifs.h" #include "psa_platform_ifs.h"
#include "psa_its_ifs.h"
/* Threads stacks */ /* Threads stacks */
@ -78,6 +79,10 @@ spm_rot_service_t platform_rot_services[PLATFORM_ROT_SRV_COUNT] = {
}, },
}; };
/* External SIDs used by PLATFORM */
const uint32_t platform_external_sids[1] = {
PSA_ITS_RESET,
};
static osRtxMutex_t platform_mutex = {0}; static osRtxMutex_t platform_mutex = {0};
static const osMutexAttr_t platform_mutex_attr = { static const osMutexAttr_t platform_mutex_attr = {

2
components/TARGET_PSA/services/platform/COMPONENT_SPE/psa_platform_partition.h
View File

@ -29,7 +29,7 @@
#define PLATFORM_ID 8 #define PLATFORM_ID 8
#define PLATFORM_ROT_SRV_COUNT (2UL) #define PLATFORM_ROT_SRV_COUNT (2UL)
#define PLATFORM_EXT_ROT_SRV_COUNT (0UL) #define PLATFORM_EXT_ROT_SRV_COUNT (1UL)
/* PLATFORM event flags */ /* PLATFORM event flags */
#define PLATFORM_RESERVED1_POS (1UL) #define PLATFORM_RESERVED1_POS (1UL)

3
components/TARGET_PSA/services/platform/platform_psa.json
View File

@ -23,6 +23,9 @@
"minor_policy": "RELAXED" "minor_policy": "RELAXED"
} }
], ],
"extern_sids": [
"PSA_ITS_RESET"
],
"source_files": [ "source_files": [
"COMPONENT_SPE/platform_partition.c" "COMPONENT_SPE/platform_partition.c"
] ]