Skip to content

Fix dependencies of platform partition #9702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2019
Merged

Fix dependencies of platform partition #9702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion TESTS/psa/spm_client/COMPONENT_SPE/psa_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "psa_its_partition.h"

extern const uint32_t crypto_srv_external_sids[4];
extern const uint32_t platform_external_sids[1];

spm_partition_t g_partitions[4] = {
{
Expand Down Expand Up @@ -64,7 +65,7 @@ spm_partition_t g_partitions[4] = {
.flags_interrupts = 0,
.rot_services = NULL,
.rot_services_count = PLATFORM_ROT_SRV_COUNT,
.extern_sids = NULL,
.extern_sids = platform_external_sids,
.extern_sids_count = PLATFORM_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL,
},
Expand Down
3 changes: 2 additions & 1 deletion TESTS/psa/spm_server/COMPONENT_SPE/psa_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

extern const uint32_t server_test_part1_external_sids[2];
extern const uint32_t crypto_srv_external_sids[4];
extern const uint32_t platform_external_sids[1];

spm_partition_t g_partitions[5] = {
{
Expand Down Expand Up @@ -77,7 +78,7 @@ spm_partition_t g_partitions[5] = {
.flags_interrupts = 0,
.rot_services = NULL,
.rot_services_count = PLATFORM_ROT_SRV_COUNT,
.extern_sids = NULL,
.extern_sids = platform_external_sids,
.extern_sids_count = PLATFORM_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL,
},
Expand Down
3 changes: 2 additions & 1 deletion TESTS/psa/spm_smoke/COMPONENT_SPE/psa_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "psa_its_partition.h"

extern const uint32_t crypto_srv_external_sids[4];
extern const uint32_t platform_external_sids[1];

spm_partition_t g_partitions[4] = {
{
Expand Down Expand Up @@ -64,7 +65,7 @@ spm_partition_t g_partitions[4] = {
.flags_interrupts = 0,
.rot_services = NULL,
.rot_services_count = PLATFORM_ROT_SRV_COUNT,
.extern_sids = NULL,
.extern_sids = platform_external_sids,
.extern_sids_count = PLATFORM_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL,
},
Expand Down
3 changes: 2 additions & 1 deletion components/TARGET_PSA/TARGET_MBED_SPM/COMPONENT_SPE/psa_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "psa_its_partition.h"

extern const uint32_t crypto_srv_external_sids[4];
extern const uint32_t platform_external_sids[1];

__attribute__((weak))
spm_partition_t g_partitions[3] = {
Expand All @@ -53,7 +54,7 @@ spm_partition_t g_partitions[3] = {
.flags_interrupts = 0,
.rot_services = NULL,
.rot_services_count = PLATFORM_ROT_SRV_COUNT,
.extern_sids = NULL,
.extern_sids = platform_external_sids,
.extern_sids_count = PLATFORM_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL,
},
Expand Down
5 changes: 5 additions & 0 deletions ...nents/TARGET_PSA/services/platform/COMPONENT_SPE/TARGET_MBED_SPM/psa_platform_partition.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "spm_internal.h"
#include "psa_platform_partition.h"
#include "psa_platform_ifs.h"
#include "psa_its_ifs.h"


/* Threads stacks */
Expand Down Expand Up @@ -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 const osMutexAttr_t platform_mutex_attr = {
Expand Down
2 changes: 1 addition & 1 deletion components/TARGET_PSA/services/platform/COMPONENT_SPE/psa_platform_partition.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define PLATFORM_ID 8

#define PLATFORM_ROT_SRV_COUNT (2UL)
#define PLATFORM_EXT_ROT_SRV_COUNT (0UL)
#define PLATFORM_EXT_ROT_SRV_COUNT (1UL)

/* PLATFORM event flags */
#define PLATFORM_RESERVED1_POS (1UL)
Expand Down
3 changes: 3 additions & 0 deletions components/TARGET_PSA/services/platform/platform_psa.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
"minor_policy": "RELAXED"
}
],
"extern_sids": [
"PSA_ITS_RESET"
],
"source_files": [
"COMPONENT_SPE/platform_partition.c"
]
Expand Down