Skip to content

Commit 594a1d1

Browse files
author
Cruz Monrreal
authored
Merge pull request ARMmbed#10218 from kfnta/tfm_auto_src_gen
PSA - TFM manfiest scan
2 parents 2d9c494 + 2bce257 commit 594a1d1

File tree

11 files changed

+86
-88
lines changed

11 files changed

+86
-88
lines changed

‎components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_partition_defs.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
/*************************** Service Partitions ******************************/
2424

25-
#define ITS_ID (TFM_SP_BASE + 0)
26-
#define PLATFORM_ID (TFM_SP_BASE + 1)
27-
#define CRYPTO_SRV_ID (TFM_SP_BASE + 2)
28-
#define ATTEST_SRV_ID (TFM_SP_BASE + 3)
25+
#define ATTEST_SRV_ID (TFM_SP_BASE + 0)
26+
#define CRYPTO_SRV_ID (TFM_SP_BASE + 1)
27+
#define PLATFORM_ID (TFM_SP_BASE + 2)
28+
#define ITS_ID (TFM_SP_BASE + 3)
2929

3030
/*************************** Test Partitions *********************************/
3131

@@ -59,4 +59,4 @@
5959
#define TFM_MAX_USER_PARTITIONS (4)
6060
#endif
6161

62-
#endif // __TFM_PARTITION_DEFS_INC__
62+
#endif // __TFM_PARTITION_DEFS_INC__

‎components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_partition_list.inc

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,29 @@
1010
#ifndef __TFM_PARTITION_LIST_INC__
1111
#define __TFM_PARTITION_LIST_INC__
1212

13-
/******** ITS ********/
14-
PARTITION_DECLARE(ITS, 0
15-
| SPM_PART_FLAG_IPC
16-
, "APPLICATION-ROT", 10, NORMAL, 2048);
17-
PARTITION_ADD_INIT_FUNC(ITS, its_entry);
18-
19-
/******** PLATFORM ********/
20-
PARTITION_DECLARE(PLATFORM, 0
13+
/******** ATTEST_SRV ********/
14+
PARTITION_DECLARE(ATTEST_SRV, 0
2115
| SPM_PART_FLAG_IPC
22-
, "APPLICATION-ROT", 8, NORMAL, 1024);
23-
PARTITION_ADD_INIT_FUNC(PLATFORM, platform_partition_entry);
16+
, "APPLICATION-ROT", 37, NORMAL, 8192);
17+
PARTITION_ADD_INIT_FUNC(ATTEST_SRV, attest_main);
2418

2519
/******** CRYPTO_SRV ********/
2620
PARTITION_DECLARE(CRYPTO_SRV, 0
2721
| SPM_PART_FLAG_IPC
2822
, "APPLICATION-ROT", 35, NORMAL, 16384);
2923
PARTITION_ADD_INIT_FUNC(CRYPTO_SRV, crypto_main);
3024

31-
/******** ATTEST_SRV ********/
32-
PARTITION_DECLARE(ATTEST_SRV, 0
25+
/******** PLATFORM ********/
26+
PARTITION_DECLARE(PLATFORM, 0
3327
| SPM_PART_FLAG_IPC
34-
, "APPLICATION-ROT", 37, NORMAL, 8192);
35-
PARTITION_ADD_INIT_FUNC(ATTEST_SRV, attest_main);
28+
, "APPLICATION-ROT", 8, NORMAL, 1024);
29+
PARTITION_ADD_INIT_FUNC(PLATFORM, platform_partition_entry);
30+
31+
/******** ITS ********/
32+
PARTITION_DECLARE(ITS, 0
33+
| SPM_PART_FLAG_IPC
34+
, "APPLICATION-ROT", 10, NORMAL, 2048);
35+
PARTITION_ADD_INIT_FUNC(ITS, its_entry);
3636

3737
#ifdef USE_PSA_TEST_PARTITIONS
3838

@@ -78,4 +78,4 @@ PARTITION_ADD_INIT_FUNC(SMOKE_TESTS_PART1, smoke_part_main);
7878

7979
#endif // USE_PSA_TEST_PARTITIONS
8080

81-
#endif // __TFM_PARTITION_LIST_INC__
81+
#endif // __TFM_PARTITION_LIST_INC__

‎components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_service_list.inc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,10 @@
1010
#ifndef __TFM_SERVICE_LIST_INC__
1111
#define __TFM_SERVICE_LIST_INC__
1212

13-
/******** ITS ********/
14-
{"PSA_ITS_GET", ITS_ID, PSA_ITS_GET_MSK, 0x00011A00, true, 1, TFM_VERSION_POLICY_RELAXED},
15-
{"PSA_ITS_SET", ITS_ID, PSA_ITS_SET_MSK, 0x00011A01, true, 1, TFM_VERSION_POLICY_RELAXED},
16-
{"PSA_ITS_INFO", ITS_ID, PSA_ITS_INFO_MSK, 0x00011A02, true, 1, TFM_VERSION_POLICY_RELAXED},
17-
{"PSA_ITS_REMOVE", ITS_ID, PSA_ITS_REMOVE_MSK, 0x00011A03, true, 1, TFM_VERSION_POLICY_RELAXED},
18-
{"PSA_ITS_RESET", ITS_ID, PSA_ITS_RESET_MSK, 0x00011A04, false, 1, TFM_VERSION_POLICY_RELAXED},
19-
20-
/******** PLATFORM ********/
21-
{"PSA_PLATFORM_LC_GET", PLATFORM_ID, PSA_PLATFORM_LC_GET_MSK, 0x00011000, true, 1, TFM_VERSION_POLICY_RELAXED},
22-
{"PSA_PLATFORM_LC_SET", PLATFORM_ID, PSA_PLATFORM_LC_SET_MSK, 0x00011001, true, 1, TFM_VERSION_POLICY_RELAXED},
23-
{"PSA_PLATFORM_SYSTEM_RESET", PLATFORM_ID, PSA_PLATFORM_SYSTEM_RESET_MSK, 0x00011002, true, 1, TFM_VERSION_POLICY_RELAXED},
13+
/******** ATTEST_SRV ********/
14+
{"PSA_ATTEST_GET_TOKEN_ID", ATTEST_SRV_ID, PSA_ATTEST_GET_TOKEN, 0x00000F10, true, 1, TFM_VERSION_POLICY_STRICT},
15+
{"PSA_ATTEST_GET_TOKEN_SIZE_ID", ATTEST_SRV_ID, PSA_ATTEST_GET_TOKEN_SIZE, 0x00000F11, true, 1, TFM_VERSION_POLICY_STRICT},
16+
{"PSA_ATTEST_INJECT_KEY_ID", ATTEST_SRV_ID, PSA_ATTEST_INJECT_KEY, 0x00000F12, true, 1, TFM_VERSION_POLICY_STRICT},
2417

2518
/******** CRYPTO_SRV ********/
2619
{"PSA_CRYPTO_INIT_ID", CRYPTO_SRV_ID, PSA_CRYPTO_INIT, 0x00000F00, true, 1, TFM_VERSION_POLICY_STRICT},
@@ -35,10 +28,17 @@
3528
{"PSA_GENERATOR_ID", CRYPTO_SRV_ID, PSA_GENERATOR, 0x00000F09, true, 1, TFM_VERSION_POLICY_STRICT},
3629
{"PSA_ENTROPY_ID", CRYPTO_SRV_ID, PSA_ENTROPY_INJECT, 0x00000F0A, true, 1, TFM_VERSION_POLICY_STRICT},
3730

38-
/******** ATTEST_SRV ********/
39-
{"PSA_ATTEST_GET_TOKEN_ID", ATTEST_SRV_ID, PSA_ATTEST_GET_TOKEN, 0x00000F10, true, 1, TFM_VERSION_POLICY_STRICT},
40-
{"PSA_ATTEST_GET_TOKEN_SIZE_ID", ATTEST_SRV_ID, PSA_ATTEST_GET_TOKEN_SIZE, 0x00000F11, true, 1, TFM_VERSION_POLICY_STRICT},
41-
{"PSA_ATTEST_INJECT_KEY_ID", ATTEST_SRV_ID, PSA_ATTEST_INJECT_KEY, 0x00000F12, true, 1, TFM_VERSION_POLICY_STRICT},
31+
/******** PLATFORM ********/
32+
{"PSA_PLATFORM_LC_GET", PLATFORM_ID, PSA_PLATFORM_LC_GET_MSK, 0x00011000, true, 1, TFM_VERSION_POLICY_RELAXED},
33+
{"PSA_PLATFORM_LC_SET", PLATFORM_ID, PSA_PLATFORM_LC_SET_MSK, 0x00011001, true, 1, TFM_VERSION_POLICY_RELAXED},
34+
{"PSA_PLATFORM_SYSTEM_RESET", PLATFORM_ID, PSA_PLATFORM_SYSTEM_RESET_MSK, 0x00011002, true, 1, TFM_VERSION_POLICY_RELAXED},
35+
36+
/******** ITS ********/
37+
{"PSA_ITS_GET", ITS_ID, PSA_ITS_GET_MSK, 0x00011A00, true, 1, TFM_VERSION_POLICY_RELAXED},
38+
{"PSA_ITS_SET", ITS_ID, PSA_ITS_SET_MSK, 0x00011A01, true, 1, TFM_VERSION_POLICY_RELAXED},
39+
{"PSA_ITS_INFO", ITS_ID, PSA_ITS_INFO_MSK, 0x00011A02, true, 1, TFM_VERSION_POLICY_RELAXED},
40+
{"PSA_ITS_REMOVE", ITS_ID, PSA_ITS_REMOVE_MSK, 0x00011A03, true, 1, TFM_VERSION_POLICY_RELAXED},
41+
{"PSA_ITS_RESET", ITS_ID, PSA_ITS_RESET_MSK, 0x00011A04, false, 1, TFM_VERSION_POLICY_RELAXED},
4242

4343
#ifdef USE_PSA_TEST_PARTITIONS
4444

@@ -81,4 +81,4 @@
8181

8282
#endif // USE_PSA_TEST_PARTITIONS
8383

84-
#endif // __TFM_SERVICE_LIST_INC__
84+
#endif // __TFM_SERVICE_LIST_INC__

‎components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/autogen/tfm_spm_signal_defs.h

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,13 @@
1010
#ifndef __TFM_SPM_SIGNAL_DEFS_H__
1111
#define __TFM_SPM_SIGNAL_DEFS_H__
1212

13-
/******** ITS ********/
14-
#define PSA_ITS_GET_MSK_POS (4UL)
15-
#define PSA_ITS_GET_MSK (1UL << PSA_ITS_GET_MSK_POS)
16-
#define PSA_ITS_SET_MSK_POS (5UL)
17-
#define PSA_ITS_SET_MSK (1UL << PSA_ITS_SET_MSK_POS)
18-
#define PSA_ITS_INFO_MSK_POS (6UL)
19-
#define PSA_ITS_INFO_MSK (1UL << PSA_ITS_INFO_MSK_POS)
20-
#define PSA_ITS_REMOVE_MSK_POS (7UL)
21-
#define PSA_ITS_REMOVE_MSK (1UL << PSA_ITS_REMOVE_MSK_POS)
22-
#define PSA_ITS_RESET_MSK_POS (8UL)
23-
#define PSA_ITS_RESET_MSK (1UL << PSA_ITS_RESET_MSK_POS)
24-
25-
/******** PLATFORM ********/
26-
#define PSA_PLATFORM_LC_GET_MSK_POS (4UL)
27-
#define PSA_PLATFORM_LC_GET_MSK (1UL << PSA_PLATFORM_LC_GET_MSK_POS)
28-
#define PSA_PLATFORM_LC_SET_MSK_POS (5UL)
29-
#define PSA_PLATFORM_LC_SET_MSK (1UL << PSA_PLATFORM_LC_SET_MSK_POS)
30-
#define PSA_PLATFORM_SYSTEM_RESET_MSK_POS (6UL)
31-
#define PSA_PLATFORM_SYSTEM_RESET_MSK (1UL << PSA_PLATFORM_SYSTEM_RESET_MSK_POS)
13+
/******** ATTEST_SRV ********/
14+
#define PSA_ATTEST_GET_TOKEN_POS (4UL)
15+
#define PSA_ATTEST_GET_TOKEN (1UL << PSA_ATTEST_GET_TOKEN_POS)
16+
#define PSA_ATTEST_GET_TOKEN_SIZE_POS (5UL)
17+
#define PSA_ATTEST_GET_TOKEN_SIZE (1UL << PSA_ATTEST_GET_TOKEN_SIZE_POS)
18+
#define PSA_ATTEST_INJECT_KEY_POS (6UL)
19+
#define PSA_ATTEST_INJECT_KEY (1UL << PSA_ATTEST_INJECT_KEY_POS)
3220

3321
/******** CRYPTO_SRV ********/
3422
#define PSA_CRYPTO_INIT_POS (4UL)
@@ -54,13 +42,25 @@
5442
#define PSA_ENTROPY_INJECT_POS (14UL)
5543
#define PSA_ENTROPY_INJECT (1UL << PSA_ENTROPY_INJECT_POS)
5644

57-
/******** ATTEST_SRV ********/
58-
#define PSA_ATTEST_GET_TOKEN_POS (4UL)
59-
#define PSA_ATTEST_GET_TOKEN (1UL << PSA_ATTEST_GET_TOKEN_POS)
60-
#define PSA_ATTEST_GET_TOKEN_SIZE_POS (5UL)
61-
#define PSA_ATTEST_GET_TOKEN_SIZE (1UL << PSA_ATTEST_GET_TOKEN_SIZE_POS)
62-
#define PSA_ATTEST_INJECT_KEY_POS (6UL)
63-
#define PSA_ATTEST_INJECT_KEY (1UL << PSA_ATTEST_INJECT_KEY_POS)
45+
/******** PLATFORM ********/
46+
#define PSA_PLATFORM_LC_GET_MSK_POS (4UL)
47+
#define PSA_PLATFORM_LC_GET_MSK (1UL << PSA_PLATFORM_LC_GET_MSK_POS)
48+
#define PSA_PLATFORM_LC_SET_MSK_POS (5UL)
49+
#define PSA_PLATFORM_LC_SET_MSK (1UL << PSA_PLATFORM_LC_SET_MSK_POS)
50+
#define PSA_PLATFORM_SYSTEM_RESET_MSK_POS (6UL)
51+
#define PSA_PLATFORM_SYSTEM_RESET_MSK (1UL << PSA_PLATFORM_SYSTEM_RESET_MSK_POS)
52+
53+
/******** ITS ********/
54+
#define PSA_ITS_GET_MSK_POS (4UL)
55+
#define PSA_ITS_GET_MSK (1UL << PSA_ITS_GET_MSK_POS)
56+
#define PSA_ITS_SET_MSK_POS (5UL)
57+
#define PSA_ITS_SET_MSK (1UL << PSA_ITS_SET_MSK_POS)
58+
#define PSA_ITS_INFO_MSK_POS (6UL)
59+
#define PSA_ITS_INFO_MSK (1UL << PSA_ITS_INFO_MSK_POS)
60+
#define PSA_ITS_REMOVE_MSK_POS (7UL)
61+
#define PSA_ITS_REMOVE_MSK (1UL << PSA_ITS_REMOVE_MSK_POS)
62+
#define PSA_ITS_RESET_MSK_POS (8UL)
63+
#define PSA_ITS_RESET_MSK (1UL << PSA_ITS_RESET_MSK_POS)
6464

6565
#ifdef USE_PSA_TEST_PARTITIONS
6666

@@ -120,4 +120,4 @@
120120

121121
#endif // USE_PSA_TEST_PARTITIONS
122122

123-
#endif // __TFM_SPM_SIGNAL_DEFS_H__
123+
#endif // __TFM_SPM_SIGNAL_DEFS_H__

‎components/TARGET_PSA/inc/psa_manifest/sid.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,10 @@
1717

1818
/*********** WARNING: This is an auto-generated file. Do not edit! ***********/
1919

20-
/******** ITS ********/
21-
#define PSA_ITS_GET 0x00011A00
22-
#define PSA_ITS_SET 0x00011A01
23-
#define PSA_ITS_INFO 0x00011A02
24-
#define PSA_ITS_REMOVE 0x00011A03
25-
#define PSA_ITS_RESET 0x00011A04
26-
27-
/******** PLATFORM ********/
28-
#define PSA_PLATFORM_LC_GET 0x00011000
29-
#define PSA_PLATFORM_LC_SET 0x00011001
30-
#define PSA_PLATFORM_SYSTEM_RESET 0x00011002
20+
/******** ATTEST_SRV ********/
21+
#define PSA_ATTEST_GET_TOKEN_ID 0x00000F10
22+
#define PSA_ATTEST_GET_TOKEN_SIZE_ID 0x00000F11
23+
#define PSA_ATTEST_INJECT_KEY_ID 0x00000F12
3124

3225
/******** CRYPTO_SRV ********/
3326
#define PSA_CRYPTO_INIT_ID 0x00000F00
@@ -42,10 +35,17 @@
4235
#define PSA_GENERATOR_ID 0x00000F09
4336
#define PSA_ENTROPY_ID 0x00000F0A
4437

45-
/******** ATTEST_SRV ********/
46-
#define PSA_ATTEST_GET_TOKEN_ID 0x00000F10
47-
#define PSA_ATTEST_GET_TOKEN_SIZE_ID 0x00000F11
48-
#define PSA_ATTEST_INJECT_KEY_ID 0x00000F12
38+
/******** PLATFORM ********/
39+
#define PSA_PLATFORM_LC_GET 0x00011000
40+
#define PSA_PLATFORM_LC_SET 0x00011001
41+
#define PSA_PLATFORM_SYSTEM_RESET 0x00011002
42+
43+
/******** ITS ********/
44+
#define PSA_ITS_GET 0x00011A00
45+
#define PSA_ITS_SET 0x00011A01
46+
#define PSA_ITS_INFO 0x00011A02
47+
#define PSA_ITS_REMOVE 0x00011A03
48+
#define PSA_ITS_RESET 0x00011A04
4949

5050

5151

‎tools/psa/generate_tfm_partition_code.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,12 @@
2626
sys.path.insert(0, ROOT)
2727

2828
from tools.psa.mbed_spm_tfm_common import \
29-
Manifest, validate_partition_manifests, manifests_discovery, MBED_OS_ROOT, SERVICES_DIR, TESTS_DIR
29+
Manifest, validate_partition_manifests, manifests_discovery, MBED_OS_ROOT
3030

3131
__version__ = '1.0'
3232
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
3333
TEMPLATES_LIST_FILE = path_join(SCRIPT_DIR, 'tfm', 'tfm_generated_file_list.json')
3434

35-
SERVICES_MANIFESTS = [
36-
path_join(SERVICES_DIR, 'storage', 'its', 'pits_psa.json'),
37-
path_join(SERVICES_DIR, 'platform', 'platform_psa.json'),
38-
path_join(SERVICES_DIR, 'crypto', 'crypto_partition_psa.json'),
39-
path_join(SERVICES_DIR, 'attestation', 'attestation_partition_psa.json')
40-
]
41-
4235

4336
def parse_manifests(manifests_files):
4437
region_list = []
@@ -104,8 +97,8 @@ def generate_partition_source_files(service_manifest_files, test_manifest_files,
10497

10598

10699
def generate_tfm_code():
107-
_, tests_manifests = manifests_discovery(TESTS_DIR)
108-
generate_partition_source_files(SERVICES_MANIFESTS, tests_manifests)
100+
service_manifests, tests_manifests = manifests_discovery(MBED_OS_ROOT)
101+
generate_partition_source_files(service_manifests, tests_manifests)
109102

110103

111104
if __name__ == '__main__':

‎tools/psa/tfm/templates/sid.h.tpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@
3333
{% endfor %}
3434

3535
{% endfor %}
36+
{# End of file #}

‎tools/psa/tfm/templates/tfm_partition_defs.inc.tpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@
4747
#endif
4848

4949
#endif // __TFM_PARTITION_DEFS_INC__
50+
{# End of file #}

‎tools/psa/tfm/templates/tfm_partition_list.inc.tpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ PARTITION_ADD_INIT_FUNC({{partition.name|upper}}, {{partition.entry_point}});
3333
#endif // USE_PSA_TEST_PARTITIONS
3434

3535
#endif // __TFM_PARTITION_LIST_INC__
36+
{# End of file #}

‎tools/psa/tfm/templates/tfm_service_list.inc.tpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@
3131
#endif // USE_PSA_TEST_PARTITIONS
3232

3333
#endif // __TFM_SERVICE_LIST_INC__
34+
{# End of file #}

0 commit comments

Comments
 (0)