Skip to content

Commit ca3a806

Browse files
committed
generate ITS auto-generated related code
1 parent c613044 commit ca3a806

File tree

8 files changed

+25
-6
lines changed

8 files changed

+25
-6
lines changed

TESTS/psa/prot_internal_storage/COMPONENT_SPE/psa_setup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "psa_its_partition.h"
3030
#include "psa_psa_f_partition.h"
3131

32+
extern const uint32_t psa_f_external_sids[4];
3233

3334
spm_partition_t g_partitions[3] = {
3435
{
@@ -60,7 +61,7 @@ spm_partition_t g_partitions[3] = {
6061
.flags_interrupts = 0,
6162
.rot_services = NULL,
6263
.rot_services_count = PSA_F_ROT_SRV_COUNT,
63-
.extern_sids = NULL,
64+
.extern_sids = psa_f_external_sids,
6465
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
6566
.irq_mapper = NULL,
6667
},

TESTS/psa/spm_client/COMPONENT_SPE/psa_setup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "psa_its_partition.h"
3030
#include "psa_psa_f_partition.h"
3131

32+
extern const uint32_t psa_f_external_sids[4];
3233

3334
spm_partition_t g_partitions[3] = {
3435
{
@@ -60,7 +61,7 @@ spm_partition_t g_partitions[3] = {
6061
.flags_interrupts = 0,
6162
.rot_services = NULL,
6263
.rot_services_count = PSA_F_ROT_SRV_COUNT,
63-
.extern_sids = NULL,
64+
.extern_sids = psa_f_external_sids,
6465
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
6566
.irq_mapper = NULL,
6667
},

TESTS/psa/spm_server/COMPONENT_SPE/psa_setup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "psa_psa_f_partition.h"
3232

3333
extern const uint32_t server_test_part1_external_sids[2];
34+
extern const uint32_t psa_f_external_sids[4];
3435

3536
spm_partition_t g_partitions[4] = {
3637
{
@@ -73,7 +74,7 @@ spm_partition_t g_partitions[4] = {
7374
.flags_interrupts = 0,
7475
.rot_services = NULL,
7576
.rot_services_count = PSA_F_ROT_SRV_COUNT,
76-
.extern_sids = NULL,
77+
.extern_sids = psa_f_external_sids,
7778
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
7879
.irq_mapper = NULL,
7980
},

TESTS/psa/spm_smoke/COMPONENT_SPE/psa_setup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "psa_its_partition.h"
3030
#include "psa_psa_f_partition.h"
3131

32+
extern const uint32_t psa_f_external_sids[4];
3233

3334
spm_partition_t g_partitions[3] = {
3435
{
@@ -60,7 +61,7 @@ spm_partition_t g_partitions[3] = {
6061
.flags_interrupts = 0,
6162
.rot_services = NULL,
6263
.rot_services_count = PSA_F_ROT_SRV_COUNT,
63-
.extern_sids = NULL,
64+
.extern_sids = psa_f_external_sids,
6465
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
6566
.irq_mapper = NULL,
6667
},

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_psa_f_partition.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "spm_internal.h"
2929
#include "psa_psa_f_partition.h"
3030
#include "psa_psa_f_ifs.h"
31+
#include "psa_its_ifs.h"
3132

3233

3334
/* Threads stacks */
@@ -184,6 +185,13 @@ spm_rot_service_t psa_f_rot_services[PSA_F_ROT_SRV_COUNT] = {
184185
},
185186
};
186187

188+
/* External SIDs used by PSA_F */
189+
const uint32_t psa_f_external_sids[4] = {
190+
PSA_ITS_GET,
191+
PSA_ITS_SET,
192+
PSA_ITS_INFO,
193+
PSA_ITS_REMOVE,
194+
};
187195

188196
static osRtxMutex_t psa_f_mutex = {0};
189197
static const osMutexAttr_t psa_f_mutex_attr = {

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_psa_f_partition.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define PSA_F_ID 35
2828

2929
#define PSA_F_ROT_SRV_COUNT (11UL)
30-
#define PSA_F_EXT_ROT_SRV_COUNT (0UL)
30+
#define PSA_F_EXT_ROT_SRV_COUNT (4UL)
3131

3232
/* PSA_F event flags */
3333
#define PSA_F_RESERVED1_POS (1UL)

components/TARGET_PSA/services/crypto/crypto_partition_psa.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@
9696
"minor_policy": "STRICT"
9797
}
9898
],
99+
"extern_sids": [
100+
"PSA_ITS_GET",
101+
"PSA_ITS_SET",
102+
"PSA_ITS_INFO",
103+
"PSA_ITS_REMOVE"
104+
],
99105
"source_files": [
100106
"COMPONENT_SPE/psa_crypto_partition.c"
101107
]

components/TARGET_PSA/spm/COMPONENT_SPE/psa_setup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "psa_its_partition.h"
2929
#include "psa_psa_f_partition.h"
3030

31+
extern const uint32_t psa_f_external_sids[4];
3132

3233
__attribute__((weak))
3334
spm_partition_t g_partitions[2] = {
@@ -49,7 +50,7 @@ spm_partition_t g_partitions[2] = {
4950
.flags_interrupts = 0,
5051
.rot_services = NULL,
5152
.rot_services_count = PSA_F_ROT_SRV_COUNT,
52-
.extern_sids = NULL,
53+
.extern_sids = psa_f_external_sids,
5354
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
5455
.irq_mapper = NULL,
5556
},

0 commit comments

Comments
 (0)