diff options
author | Ken Liu <ken.liu@arm.com> | 2020-01-16 13:19:16 +0800 |
---|---|---|
committer | Ken Liu <ken.liu@arm.com> | 2020-01-17 08:47:16 +0000 |
commit | 2679c160ea2485d529c3874fed6cc20185908a79 (patch) | |
tree | d54893c01ad76b25b5038bf7ec91b7b98e9d0b3d | |
parent | 6e22f2f1e5a082c675e811e5e97ede422978e661 (diff) | |
download | trusted-firmware-m-2679c160ea2485d529c3874fed6cc20185908a79.tar.gz |
Test: Increase client partition stack size
After the psa_call parameters packing mechanism is updated, one more
local variable 'tfm_control_parameter_t' is introduced, which causes
the stack usage increased a bit. Increase the client partition's stack
size to make the execution safer.
Check commit '83ac1cab0bc8ec0a6bd0527a748c3463b8ee11be' for details.
The stack increment is tiny and one of the increment is in the test
partition, which is optional for real usage. This won't increase the
whole runtime size much and it is under control.
Change-Id: I5ad72faf6b67b24dc4553ef623d0729c702fa798
Signed-off-by: Ken Liu <ken.liu@arm.com>
4 files changed, 7 insertions, 7 deletions
diff --git a/platform/ext/common/armclang/tfm_common_s.sct b/platform/ext/common/armclang/tfm_common_s.sct index e369c5198d..01b02c74ea 100644 --- a/platform/ext/common/armclang/tfm_common_s.sct +++ b/platform/ext/common/armclang/tfm_common_s.sct @@ -244,7 +244,7 @@ LR_CODE S_CODE_START { } #if defined (TFM_PSA_API) - TFM_SP_IPC_CLIENT_TEST_LINKER_STACK +0 ALIGN 128 EMPTY 0x0240 { + TFM_SP_IPC_CLIENT_TEST_LINKER_STACK +0 ALIGN 128 EMPTY 0x0280 { } #endif #endif /* TFM_PARTITION_TEST_CORE_IPC */ @@ -429,7 +429,7 @@ LR_CODE S_CODE_START { } #if defined (TFM_PSA_API) - TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK +0 ALIGN 128 EMPTY 0x0C00 { + TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK +0 ALIGN 128 EMPTY 0x0C80 { } #endif #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */ diff --git a/platform/ext/common/gcc/tfm_common_s.ld b/platform/ext/common/gcc/tfm_common_s.ld index 9b2734daef..1d77094477 100644 --- a/platform/ext/common/gcc/tfm_common_s.ld +++ b/platform/ext/common/gcc/tfm_common_s.ld @@ -703,7 +703,7 @@ SECTIONS #if defined (TFM_PSA_API) .TFM_SP_IPC_CLIENT_TEST_LINKER_STACK : ALIGN(128) { - . += 0x0240; + . += 0x0280; } > RAM Image$$TFM_SP_IPC_CLIENT_TEST_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER_STACK); Image$$TFM_SP_IPC_CLIENT_TEST_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER_STACK) + SIZEOF(.TFM_SP_IPC_CLIENT_TEST_LINKER_STACK); @@ -1140,7 +1140,7 @@ SECTIONS #if defined (TFM_PSA_API) .TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK : ALIGN(128) { - . += 0x0C00; + . += 0x0C80; } > RAM Image$$TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK); Image$$TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK); 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 3d9f01a00f..626bdbdb31 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 @@ -11,7 +11,7 @@ "type": "APPLICATION-ROT", "priority": "NORMAL", "entry_point": "ipc_client_test_main", - "stack_size": "0x0240", + "stack_size": "0x0280", "secure_functions": [ ], "services" : [ diff --git a/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml b/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml index 24bbdc2e52..1a91aacd2b 100644 --- a/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml +++ b/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------- -# Copyright (c) 2018-2019, Arm Limited. All rights reserved. +# Copyright (c) 2018-2020, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -11,7 +11,7 @@ "type": "PSA-ROT", "priority": "NORMAL", "entry_point": "tfm_secure_client_service_init", - "stack_size": "0x0C00", + "stack_size": "0x0C80", "mmio_regions": [ { "name": "TFM_PERIPHERAL_STD_UART", |