diff options
author | Mate Toth-Pal <mate.toth-pal@arm.com> | 2019-04-15 15:40:27 +0200 |
---|---|---|
committer | Edison Ai <edison.ai@arm.com> | 2019-06-28 08:53:56 +0800 |
commit | 8ef1d21d8477878081e9b8fe2586387b9cc42932 (patch) | |
tree | 6437192d5b8e1fa869e198854c01c6999d4fd0ae | |
parent | 94925722a2bc5b8725a5731c127244cc31d50d9c (diff) | |
download | trusted-firmware-m-8ef1d21d8477878081e9b8fe2586387b9cc42932.tar.gz |
Build: remove tfm_partition_ipc from manifests
Secure Partition manifest attribute 'tfm_partition_ipc' is not compliant
with the PSA Firmware Framework specification. Move it to the TF-M
specific tfm_manifest_list.yaml.
Change-Id: Ib1ce3f8416d51bb43cd037a378bd4fb7b67d9bdf
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>
13 files changed, 16 insertions, 14 deletions
diff --git a/platform/ext/common/armclang/tfm_common_s.sct.template b/platform/ext/common/armclang/tfm_common_s.sct.template index 5b86230bad..351d4ae749 100644 --- a/platform/ext/common/armclang/tfm_common_s.sct.template +++ b/platform/ext/common/armclang/tfm_common_s.sct.template @@ -184,7 +184,7 @@ LR_CODE S_CODE_START { {% endif %} } - {% if manifest.manifest.tfm_partition_ipc %} + {% if manifest.attr.tfm_partition_ipc %} #if defined (TFM_PSA_API) || (TFM_LVL != 1) {{manifest.manifest.name}}_STACK +0 ALIGN 128 EMPTY {{manifest.manifest.stack_size}} { } @@ -237,7 +237,7 @@ LR_CODE S_CODE_START { {% endif %} } - {% if manifest.manifest.tfm_partition_ipc %} + {% if manifest.attr.tfm_partition_ipc %} #if defined (TFM_PSA_API) || (TFM_LVL != 1) {{manifest.manifest.name}}_STACK +0 ALIGN 128 EMPTY {{manifest.manifest.stack_size}} { } diff --git a/platform/ext/common/gcc/tfm_common_s.ld.template b/platform/ext/common/gcc/tfm_common_s.ld.template index f8b1590a60..878ce06da9 100644 --- a/platform/ext/common/gcc/tfm_common_s.ld.template +++ b/platform/ext/common/gcc/tfm_common_s.ld.template @@ -399,7 +399,7 @@ SECTIONS Image$${{manifest.manifest.name}}_DATA$$ZI$$Base = ADDR(.{{manifest.manifest.name}}_BSS); Image$${{manifest.manifest.name}}_DATA$$ZI$$Limit = ADDR(.{{manifest.manifest.name}}_BSS) + SIZEOF(.{{manifest.manifest.name}}_BSS); - {% if manifest.manifest.tfm_partition_ipc %} + {% if manifest.attr.tfm_partition_ipc %} #if defined (TFM_PSA_API) || (TFM_LVL != 1) .{{manifest.manifest.name}}_STACK : ALIGN(128) { @@ -477,7 +477,7 @@ SECTIONS Image$${{manifest.manifest.name}}_DATA$$ZI$$Base = ADDR(.{{manifest.manifest.name}}_BSS); Image$${{manifest.manifest.name}}_DATA$$ZI$$Limit = ADDR(.{{manifest.manifest.name}}_BSS) + SIZEOF(.{{manifest.manifest.name}}_BSS); - {% if manifest.manifest.tfm_partition_ipc %} + {% if manifest.attr.tfm_partition_ipc %} #if defined (TFM_PSA_API) || (TFM_LVL != 1) .{{manifest.manifest.name}}_STACK : ALIGN(128) { diff --git a/secure_fw/services/crypto/manifest.yaml b/secure_fw/services/crypto/manifest.yaml index 67b679fe93..b0d0ab18bd 100644 --- a/secure_fw/services/crypto/manifest.yaml +++ b/secure_fw/services/crypto/manifest.yaml @@ -13,7 +13,6 @@ "entry_point": "tfm_crypto_init", "stack_size": "0x2000", "heap_size": "0x0400", - "tfm_partition_ipc": true, "secure_functions": [ { "sfid": "TFM_CRYPTO_ALLOCATE_KEY_SFID", diff --git a/secure_fw/services/initial_attestation/manifest.yaml b/secure_fw/services/initial_attestation/manifest.yaml index 32ed553982..1969443528 100644 --- a/secure_fw/services/initial_attestation/manifest.yaml +++ b/secure_fw/services/initial_attestation/manifest.yaml @@ -13,7 +13,6 @@ "entry_point": "attest_partition_init", "stack_size": "0x0A00", "heap_size": "0x0400", - "tfm_partition_ipc": true, "secure_functions": [ { "sfid": "TFM_ATTEST_GET_TOKEN_SFID", diff --git a/secure_fw/services/secure_storage/manifest.yaml b/secure_fw/services/secure_storage/manifest.yaml index 89245fb0c9..ada4beb748 100644 --- a/secure_fw/services/secure_storage/manifest.yaml +++ b/secure_fw/services/secure_storage/manifest.yaml @@ -13,7 +13,6 @@ "entry_point": "tfm_sst_req_mngr_init", "stack_size": "0x1800", "heap_size": "0", - "tfm_partition_ipc": true, "secure_functions": [ { "sfid": "TFM_SST_SET_SFID", diff --git a/secure_fw/services/tfm_partition_list.inc.template b/secure_fw/services/tfm_partition_list.inc.template index 3f9348c105..e314c2327d 100644 --- a/secure_fw/services/tfm_partition_list.inc.template +++ b/secure_fw/services/tfm_partition_list.inc.template @@ -16,7 +16,7 @@ {% endif %} /******** {{manifest.manifest.name}} ********/ PARTITION_DECLARE({{manifest.manifest.name}}, 0 - {% if manifest.manifest.tfm_partition_ipc %} + {% if manifest.attr.tfm_partition_ipc %} | SPM_PART_FLAG_IPC {% endif %} , "{{manifest.manifest.type}}", {{manifest.manifest.id}}, {{manifest.manifest.priority}}); diff --git a/secure_fw/services/tfm_service_list.inc.template b/secure_fw/services/tfm_service_list.inc.template index dd9b45778b..ec871ef745 100644 --- a/secure_fw/services/tfm_service_list.inc.template +++ b/secure_fw/services/tfm_service_list.inc.template @@ -11,7 +11,7 @@ #define __TFM_SERVICE_LIST_INC__ {% for manifest in manifests %} - {% if manifest.manifest.tfm_partition_ipc %} + {% if manifest.attr.tfm_partition_ipc %} {% if manifest.attr.conditional %} #ifdef {{manifest.attr.conditional}} {% endif %} diff --git a/test/test_services/tfm_core_test/manifest.yaml b/test/test_services/tfm_core_test/manifest.yaml index e796be030a..bb2d0620ae 100644 --- a/test/test_services/tfm_core_test/manifest.yaml +++ b/test/test_services/tfm_core_test/manifest.yaml @@ -11,7 +11,6 @@ "priority": "NORMAL", "id": "0x00000002", "entry_point": "core_test_init", - "tfm_partition_ipc": true, "stack_size": "0x0300", "heap_size": "0", "mmio_regions": [ diff --git a/test/test_services/tfm_core_test_2/manifest.yaml b/test/test_services/tfm_core_test_2/manifest.yaml index 76af51dfda..f5214360fc 100644 --- a/test/test_services/tfm_core_test_2/manifest.yaml +++ b/test/test_services/tfm_core_test_2/manifest.yaml @@ -11,7 +11,6 @@ "priority": "NORMAL", "id": "0x00000003", "entry_point": "core_test_2_init", - "tfm_partition_ipc": true, "stack_size": "0x0200", "heap_size": "0", "secure_functions": [ diff --git a/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml b/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml index 018cf7eba7..37056aad68 100644 --- a/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml +++ b/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml @@ -15,7 +15,6 @@ "heap_size": "0", "secure_functions": [ ], - "tfm_partition_ipc": true, "services" : [ { "name": "IPC_CLIENT_TEST_BASIC_SID", diff --git a/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml b/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml index dd06be3a70..878cab1829 100644 --- a/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml +++ b/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml @@ -15,7 +15,6 @@ "heap_size": "0", "secure_functions": [ ], - "tfm_partition_ipc": true, "services" : [ { "name": "IPC_SERVICE_TEST_BASIC_SID", diff --git a/test/test_services/tfm_secure_client_service/manifest.yaml b/test/test_services/tfm_secure_client_service/manifest.yaml index 3293643288..dfed01194d 100644 --- a/test/test_services/tfm_secure_client_service/manifest.yaml +++ b/test/test_services/tfm_secure_client_service/manifest.yaml @@ -13,7 +13,6 @@ "entry_point": "tfm_secure_client_service_init", "stack_size": "0x0C00", "heap_size": "0", - "tfm_partition_ipc": true, "mmio_regions": [ { "name": "TFM_PERIPHERAL_STD_UART", diff --git a/tools/tfm_manifest_list.yaml b/tools/tfm_manifest_list.yaml index ff3db726a3..b55a0e90eb 100644 --- a/tools/tfm_manifest_list.yaml +++ b/tools/tfm_manifest_list.yaml @@ -16,6 +16,7 @@ "short_name": "SST", "manifest": "secure_fw/services/secure_storage/manifest.yaml", "tfm_extensions": true, + "tfm_partition_ipc": true, "version_major": 0, "version_minor": 1 }, @@ -25,6 +26,7 @@ "manifest": "secure_fw/services/audit_logging/manifest.yaml", "conditional": "TFM_PARTITION_AUDIT_LOG", "tfm_extensions": true, + "tfm_partition_ipc": false, "version_major": 0, "version_minor": 1 }, @@ -33,6 +35,7 @@ "short_name": "TFM_Crypto", "manifest": "secure_fw/services/crypto/manifest.yaml", "tfm_extensions": true, + "tfm_partition_ipc": true, "version_major": 0, "version_minor": 1 }, @@ -41,6 +44,7 @@ "short_name": "TFM_SP_Platform", "manifest": "secure_fw/services/platform/manifest.yaml", "tfm_extensions": true, + "tfm_partition_ipc": false, "conditional": "TFM_PARTITION_PLATFORM", "version_major": 0, "version_minor": 1 @@ -50,6 +54,7 @@ "short_name": "TFM_Init_Attest", "manifest": "secure_fw/services/initial_attestation/manifest.yaml", "tfm_extensions": true, + "tfm_partition_ipc": true, "version_major": 0, "version_minor": 1 }, @@ -58,6 +63,7 @@ "short_name": "TFM_Core_Test", "manifest": "test/test_services/tfm_core_test/manifest.yaml", "tfm_extensions": true, + "tfm_partition_ipc": true, "conditional": "TFM_PARTITION_TEST_CORE", "version_major": 0, "version_minor": 1 @@ -67,6 +73,7 @@ "short_name": "TFM_Core_Test_2", "manifest": "test/test_services/tfm_core_test_2/manifest.yaml", "tfm_extensions": true, + "tfm_partition_ipc": true, "conditional": "TFM_PARTITION_TEST_CORE", "version_major": 0, "version_minor": 1 @@ -76,6 +83,7 @@ "short_name": "TFM_Secure_Client", "manifest": "test/test_services/tfm_secure_client_service/manifest.yaml", "tfm_extensions": true, + "tfm_partition_ipc": true, "conditional": "TFM_PARTITION_TEST_SECURE_SERVICES", "version_major": 0, "version_minor": 1 @@ -85,6 +93,7 @@ "short_name": "TFM_IPC_Service", "manifest": "test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml", "tfm_extensions": true, + "tfm_partition_ipc": true, "conditional": "TFM_PARTITION_TEST_CORE_IPC", "version_major": 0, "version_minor": 1 @@ -94,6 +103,7 @@ "short_name": "TFM_IPC_Client", "manifest": "test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml", "tfm_extensions": true, + "tfm_partition_ipc": true, "conditional": "TFM_PARTITION_TEST_CORE_IPC", "version_major": 0, "version_minor": 1 |