Skip to content

Commit bbd93fe

Browse files
mohammad1603mohammad1603
committed
Update auto generated SPM files
1 parent 3d92475 commit bbd93fe

File tree

4 files changed

+56
-52
lines changed

4 files changed

+56
-52
lines changed

‎TESTS/psa/prot_internal_storage/COMPONENT_SPE/psa_setup.c

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
#include "handles_manager.h"
2727
#include "cmsis.h"
2828
#include "psa_test_its_reset_partition.h"
29-
#include "psa_psa_f_partition.h"
3029
#include "psa_its_partition.h"
30+
#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
{
@@ -43,25 +44,25 @@ spm_partition_t g_partitions[3] = {
4344
.irq_mapper = NULL,
4445
},
4546
{
46-
.partition_id = PSA_F_ID,
47+
.partition_id = ITS_ID,
4748
.thread_id = 0,
48-
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
49+
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
4950
.flags_interrupts = 0,
5051
.rot_services = NULL,
51-
.rot_services_count = PSA_F_ROT_SRV_COUNT,
52+
.rot_services_count = ITS_ROT_SRV_COUNT,
5253
.extern_sids = NULL,
53-
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
54+
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
5455
.irq_mapper = NULL,
5556
},
5657
{
57-
.partition_id = ITS_ID,
58+
.partition_id = PSA_F_ID,
5859
.thread_id = 0,
59-
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
60+
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
6061
.flags_interrupts = 0,
6162
.rot_services = NULL,
62-
.rot_services_count = ITS_ROT_SRV_COUNT,
63-
.extern_sids = NULL,
64-
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
63+
.rot_services_count = PSA_F_ROT_SRV_COUNT,
64+
.extern_sids = psa_f_external_sids,
65+
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
6566
.irq_mapper = NULL,
6667
},
6768
};
@@ -75,8 +76,8 @@ const uint32_t mem_region_count = 0;
7576

7677
// forward declaration of partition initializers
7778
void test_its_reset_init(spm_partition_t *partition);
78-
void psa_f_init(spm_partition_t *partition);
7979
void its_init(spm_partition_t *partition);
80+
void psa_f_init(spm_partition_t *partition);
8081

8182
uint32_t init_partitions(spm_partition_t **partitions)
8283
{
@@ -85,8 +86,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
8586
}
8687

8788
test_its_reset_init(&(g_partitions[0]));
88-
psa_f_init(&(g_partitions[1]));
89-
its_init(&(g_partitions[2]));
89+
its_init(&(g_partitions[1]));
90+
psa_f_init(&(g_partitions[2]));
9091

9192
*partitions = g_partitions;
9293
return 3;

‎TESTS/psa/spm_client/COMPONENT_SPE/psa_setup.c

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
#include "handles_manager.h"
2727
#include "cmsis.h"
2828
#include "psa_client_tests_part1_partition.h"
29-
#include "psa_psa_f_partition.h"
3029
#include "psa_its_partition.h"
30+
#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
{
@@ -43,25 +44,25 @@ spm_partition_t g_partitions[3] = {
4344
.irq_mapper = NULL,
4445
},
4546
{
46-
.partition_id = PSA_F_ID,
47+
.partition_id = ITS_ID,
4748
.thread_id = 0,
48-
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
49+
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
4950
.flags_interrupts = 0,
5051
.rot_services = NULL,
51-
.rot_services_count = PSA_F_ROT_SRV_COUNT,
52+
.rot_services_count = ITS_ROT_SRV_COUNT,
5253
.extern_sids = NULL,
53-
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
54+
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
5455
.irq_mapper = NULL,
5556
},
5657
{
57-
.partition_id = ITS_ID,
58+
.partition_id = PSA_F_ID,
5859
.thread_id = 0,
59-
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
60+
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
6061
.flags_interrupts = 0,
6162
.rot_services = NULL,
62-
.rot_services_count = ITS_ROT_SRV_COUNT,
63-
.extern_sids = NULL,
64-
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
63+
.rot_services_count = PSA_F_ROT_SRV_COUNT,
64+
.extern_sids = psa_f_external_sids,
65+
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
6566
.irq_mapper = NULL,
6667
},
6768
};
@@ -75,8 +76,8 @@ const uint32_t mem_region_count = 0;
7576

7677
// forward declaration of partition initializers
7778
void client_tests_part1_init(spm_partition_t *partition);
78-
void psa_f_init(spm_partition_t *partition);
7979
void its_init(spm_partition_t *partition);
80+
void psa_f_init(spm_partition_t *partition);
8081

8182
uint32_t init_partitions(spm_partition_t **partitions)
8283
{
@@ -85,8 +86,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
8586
}
8687

8788
client_tests_part1_init(&(g_partitions[0]));
88-
psa_f_init(&(g_partitions[1]));
89-
its_init(&(g_partitions[2]));
89+
its_init(&(g_partitions[1]));
90+
psa_f_init(&(g_partitions[2]));
9091

9192
*partitions = g_partitions;
9293
return 3;

‎TESTS/psa/spm_server/COMPONENT_SPE/psa_setup.c

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@
2727
#include "cmsis.h"
2828
#include "psa_server_test_part1_partition.h"
2929
#include "psa_server_test_part2_partition.h"
30-
#include "psa_psa_f_partition.h"
3130
#include "psa_its_partition.h"
31+
#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
{
@@ -56,25 +57,25 @@ spm_partition_t g_partitions[4] = {
5657
.irq_mapper = NULL,
5758
},
5859
{
59-
.partition_id = PSA_F_ID,
60+
.partition_id = ITS_ID,
6061
.thread_id = 0,
61-
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
62+
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
6263
.flags_interrupts = 0,
6364
.rot_services = NULL,
64-
.rot_services_count = PSA_F_ROT_SRV_COUNT,
65+
.rot_services_count = ITS_ROT_SRV_COUNT,
6566
.extern_sids = NULL,
66-
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
67+
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
6768
.irq_mapper = NULL,
6869
},
6970
{
70-
.partition_id = ITS_ID,
71+
.partition_id = PSA_F_ID,
7172
.thread_id = 0,
72-
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
73+
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
7374
.flags_interrupts = 0,
7475
.rot_services = NULL,
75-
.rot_services_count = ITS_ROT_SRV_COUNT,
76-
.extern_sids = NULL,
77-
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
76+
.rot_services_count = PSA_F_ROT_SRV_COUNT,
77+
.extern_sids = psa_f_external_sids,
78+
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
7879
.irq_mapper = NULL,
7980
},
8081
};
@@ -89,8 +90,8 @@ const uint32_t mem_region_count = 0;
8990
// forward declaration of partition initializers
9091
void server_test_part1_init(spm_partition_t *partition);
9192
void server_test_part2_init(spm_partition_t *partition);
92-
void psa_f_init(spm_partition_t *partition);
9393
void its_init(spm_partition_t *partition);
94+
void psa_f_init(spm_partition_t *partition);
9495

9596
uint32_t init_partitions(spm_partition_t **partitions)
9697
{
@@ -100,8 +101,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
100101

101102
server_test_part1_init(&(g_partitions[0]));
102103
server_test_part2_init(&(g_partitions[1]));
103-
psa_f_init(&(g_partitions[2]));
104-
its_init(&(g_partitions[3]));
104+
its_init(&(g_partitions[2]));
105+
psa_f_init(&(g_partitions[3]));
105106

106107
*partitions = g_partitions;
107108
return 4;

‎TESTS/psa/spm_smoke/COMPONENT_SPE/psa_setup.c

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
#include "handles_manager.h"
2727
#include "cmsis.h"
2828
#include "psa_smoke_test_part1_partition.h"
29-
#include "psa_psa_f_partition.h"
3029
#include "psa_its_partition.h"
30+
#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
{
@@ -43,25 +44,25 @@ spm_partition_t g_partitions[3] = {
4344
.irq_mapper = NULL,
4445
},
4546
{
46-
.partition_id = PSA_F_ID,
47+
.partition_id = ITS_ID,
4748
.thread_id = 0,
48-
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
49+
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
4950
.flags_interrupts = 0,
5051
.rot_services = NULL,
51-
.rot_services_count = PSA_F_ROT_SRV_COUNT,
52+
.rot_services_count = ITS_ROT_SRV_COUNT,
5253
.extern_sids = NULL,
53-
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
54+
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
5455
.irq_mapper = NULL,
5556
},
5657
{
57-
.partition_id = ITS_ID,
58+
.partition_id = PSA_F_ID,
5859
.thread_id = 0,
59-
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
60+
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
6061
.flags_interrupts = 0,
6162
.rot_services = NULL,
62-
.rot_services_count = ITS_ROT_SRV_COUNT,
63-
.extern_sids = NULL,
64-
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
63+
.rot_services_count = PSA_F_ROT_SRV_COUNT,
64+
.extern_sids = psa_f_external_sids,
65+
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
6566
.irq_mapper = NULL,
6667
},
6768
};
@@ -75,8 +76,8 @@ const uint32_t mem_region_count = 0;
7576

7677
// forward declaration of partition initializers
7778
void smoke_test_part1_init(spm_partition_t *partition);
78-
void psa_f_init(spm_partition_t *partition);
7979
void its_init(spm_partition_t *partition);
80+
void psa_f_init(spm_partition_t *partition);
8081

8182
uint32_t init_partitions(spm_partition_t **partitions)
8283
{
@@ -85,8 +86,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
8586
}
8687

8788
smoke_test_part1_init(&(g_partitions[0]));
88-
psa_f_init(&(g_partitions[1]));
89-
its_init(&(g_partitions[2]));
89+
its_init(&(g_partitions[1]));
90+
psa_f_init(&(g_partitions[2]));
9091

9192
*partitions = g_partitions;
9293
return 3;

0 commit comments

Comments
 (0)