diff options
author | David Hu <david.hu@arm.com> | 2020-05-11 15:37:54 +0800 |
---|---|---|
committer | David Hu <david.hu@arm.com> | 2020-08-12 14:49:40 +0800 |
commit | f1e36e8f7a2268d912d06bdce850c33e9bd63a91 (patch) | |
tree | 09ca3dd7f67501261996415dae05ad305900eca6 /platform | |
parent | 675286d6ffd8703ae7f0debf76f286abb89a0843 (diff) | |
download | trusted-firmware-m-f1e36e8f7a2268d912d06bdce850c33e9bd63a91.tar.gz |
Test: Simplify dual-cpu lightweight NS multi-thread test
Call psa_framework_version() in lightweight NS multi-thread test
case in dual-cpu test, instead of calling a dedicated test secure
partition.
It can simplify the test process and shorten the client call
execution, which fit the lightweight test requirement more. It also
decreases the memory footprint.
Remove the dedicated test secure partition from SPE.
Update the manifest files.
Change-Id: Iedb2e1f83ab55c5040eca411e501c33588690d9b
Signed-off-by: David Hu <david.hu@arm.com>
Diffstat (limited to 'platform')
-rw-r--r-- | platform/ext/common/armclang/tfm_common_s.sct | 20 | ||||
-rw-r--r-- | platform/ext/common/gcc/tfm_common_s.ld | 60 | ||||
-rw-r--r-- | platform/ext/common/iar/tfm_common_s.icf | 28 |
3 files changed, 0 insertions, 108 deletions
diff --git a/platform/ext/common/armclang/tfm_common_s.sct b/platform/ext/common/armclang/tfm_common_s.sct index 040a70ebfb..355197bc14 100644 --- a/platform/ext/common/armclang/tfm_common_s.sct +++ b/platform/ext/common/armclang/tfm_common_s.sct @@ -168,13 +168,6 @@ LR_CODE S_CODE_START { } #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */ -#ifdef TFM_MULTI_CORE_TEST - TFM_SP_MULTI_CORE_TEST_LINKER +0 ALIGN 32 { - *multi_core_test.* (+RO) - *(TFM_SP_MULTI_CORE_TEST_ATTR_FN) - } -#endif /* TFM_MULTI_CORE_TEST */ - /* * This empty, zero long execution region is here to mark the end address * of APP RoT code. @@ -303,19 +296,6 @@ LR_CODE S_CODE_START { #endif #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */ -#ifdef TFM_MULTI_CORE_TEST - TFM_SP_MULTI_CORE_TEST_LINKER_DATA +0 ALIGN 32 { - *multi_core_test.* (+RW +ZI) - *(TFM_SP_MULTI_CORE_TEST_ATTR_RW) - *(TFM_SP_MULTI_CORE_TEST_ATTR_ZI) - } - -#if defined (TFM_PSA_API) - TFM_SP_MULTI_CORE_TEST_LINKER_STACK +0 ALIGN 128 EMPTY 0x0100 { - } -#endif -#endif /* TFM_MULTI_CORE_TEST */ - /* * This empty, zero long execution region is here to mark the end address * of APP RoT RW and Stack. diff --git a/platform/ext/common/gcc/tfm_common_s.ld b/platform/ext/common/gcc/tfm_common_s.ld index 204413d39d..d847a44330 100644 --- a/platform/ext/common/gcc/tfm_common_s.ld +++ b/platform/ext/common/gcc/tfm_common_s.ld @@ -137,11 +137,6 @@ SECTIONS LONG (ADDR(.TFM_SP_SECURE_CLIENT_2_LINKER_DATA)) LONG (SIZEOF(.TFM_SP_SECURE_CLIENT_2_LINKER_DATA)) #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */ -#ifdef TFM_MULTI_CORE_TEST - LONG (LOADADDR(.TFM_SP_MULTI_CORE_TEST_LINKER_DATA)) - LONG (ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER_DATA)) - LONG (SIZEOF(.TFM_SP_MULTI_CORE_TEST_LINKER_DATA)) -#endif /* TFM_MULTI_CORE_TEST */ #if defined (S_RAM_CODE_START) LONG (LOADADDR(.TFM_RAM_CODE)) LONG (ADDR(.TFM_RAM_CODE)) @@ -276,14 +271,6 @@ SECTIONS LONG (SIZEOF(.TFM_SP_SECURE_CLIENT_2_LINKER_STACK)) #endif #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */ -#ifdef TFM_MULTI_CORE_TEST - LONG (ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER_BSS)) - LONG (SIZEOF(.TFM_SP_MULTI_CORE_TEST_LINKER_BSS)) -#if defined(TFM_PSA_API) - LONG (ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER_STACK)) - LONG (SIZEOF(.TFM_SP_MULTI_CORE_TEST_LINKER_STACK)) -#endif -#endif /* TFM_MULTI_CORE_TEST */ __zero_table_end__ = .; } > FLASH @@ -538,20 +525,6 @@ SECTIONS Image$$TFM_SP_SECURE_CLIENT_2_LINKER$$Limit = ADDR(.TFM_SP_SECURE_CLIENT_2_LINKER) + SIZEOF(.TFM_SP_SECURE_CLIENT_2_LINKER); #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */ -#ifdef TFM_MULTI_CORE_TEST - .TFM_SP_MULTI_CORE_TEST_LINKER : ALIGN(32) - { - *multi_core_test.*(.text*) - *multi_core_test.*(.rodata*) - *(TFM_SP_MULTI_CORE_TEST_ATTR_FN) - . = ALIGN(32); - } > FLASH - Image$$TFM_SP_MULTI_CORE_TEST_LINKER$$RO$$Base = ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER); - Image$$TFM_SP_MULTI_CORE_TEST_LINKER$$RO$$Limit = ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER) + SIZEOF(.TFM_SP_MULTI_CORE_TEST_LINKER); - Image$$TFM_SP_MULTI_CORE_TEST_LINKER$$Base = ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER); - Image$$TFM_SP_MULTI_CORE_TEST_LINKER$$Limit = ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER) + SIZEOF(.TFM_SP_MULTI_CORE_TEST_LINKER); -#endif /* TFM_MULTI_CORE_TEST */ - /**** APPLICATION RoT RO part (CODE + RODATA) end here */ Image$$TFM_APP_CODE_END$$Base = .; @@ -866,39 +839,6 @@ SECTIONS #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */ -#ifdef TFM_MULTI_CORE_TEST - .TFM_SP_MULTI_CORE_TEST_LINKER_DATA : ALIGN(32) - { - *multi_core_test.*(.data*) - *(TFM_SP_MULTI_CORE_TEST_ATTR_RW) - . = ALIGN(32); - } > RAM AT> FLASH - Image$$TFM_SP_MULTI_CORE_TEST_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER_DATA); - Image$$TFM_SP_MULTI_CORE_TEST_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER_DATA) + SIZEOF(.TFM_SP_MULTI_CORE_TEST_LINKER_DATA); - - .TFM_SP_MULTI_CORE_TEST_LINKER_BSS : ALIGN(32) - { - start_of_TFM_SP_MULTI_CORE_TEST_LINKER = .; - *multi_core_test.*(.bss*) - *multi_core_test.*(COMMON) - *(TFM_SP_MULTI_CORE_TEST_ATTR_ZI) - . += (. - start_of_TFM_SP_MULTI_CORE_TEST_LINKER) ? 0 : 4; - . = ALIGN(32); - } > RAM AT> RAM - Image$$TFM_SP_MULTI_CORE_TEST_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER_BSS); - Image$$TFM_SP_MULTI_CORE_TEST_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER_BSS) + SIZEOF(.TFM_SP_MULTI_CORE_TEST_LINKER_BSS); - -#if defined (TFM_PSA_API) - .TFM_SP_MULTI_CORE_TEST_LINKER_STACK : ALIGN(128) - { - . += 0x0100; - } > RAM - Image$$TFM_SP_MULTI_CORE_TEST_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER_STACK); - Image$$TFM_SP_MULTI_CORE_TEST_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_MULTI_CORE_TEST_LINKER_STACK) + SIZEOF(.TFM_SP_MULTI_CORE_TEST_LINKER_STACK); -#endif - -#endif /* TFM_MULTI_CORE_TEST */ - /**** APPLICATION RoT DATA end here */ Image$$TFM_APP_RW_STACK_END$$Base = .; diff --git a/platform/ext/common/iar/tfm_common_s.icf b/platform/ext/common/iar/tfm_common_s.icf index 6ac95be836..a8ed93b3cc 100644 --- a/platform/ext/common/iar/tfm_common_s.icf +++ b/platform/ext/common/iar/tfm_common_s.icf @@ -148,12 +148,6 @@ define block TFM_SP_SECURE_CLIENT_2_LINKER with alignment = 32 { }; #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */ -#ifdef TFM_MULTI_CORE_TEST -define block TFM_SP_MULTI_CORE_TEST_LINKER with alignment = 32 { - ro object *multi_core_test.*, - }; -#endif /* TFM_MULTI_CORE_TEST */ - /* * This empty, zero long execution region is here to mark the end address * of APP RoT code. @@ -236,16 +230,6 @@ define block TFM_SP_SECURE_CLIENT_2_LINKER_STACK with alignment = 128, size = 0x #endif #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */ -#ifdef TFM_MULTI_CORE_TEST -define block TFM_SP_MULTI_CORE_TEST_LINKER_DATA with alignment = 32 { - rw object *multi_core_test.*, - }; - -#if defined (TFM_PSA_API) -define block TFM_SP_MULTI_CORE_TEST_LINKER_STACK with alignment = 128, size = 0x0100 { }; -#endif -#endif /* TFM_MULTI_CORE_TEST */ - /* * This empty, zero long execution region is here to mark the end address @@ -461,10 +445,6 @@ define block LR_CODE with fixed order { block TFM_SP_SECURE_CLIENT_2_LINKER, #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */ -#ifdef TFM_MULTI_CORE_TEST - block TFM_SP_MULTI_CORE_TEST_LINKER, -#endif /* TFM_MULTI_CORE_TEST */ - /* * This empty, zero long execution region is here to mark the end address * of APP RoT code. @@ -557,14 +537,6 @@ define block DATA with fixed order { #endif #endif /* TFM_PARTITION_TEST_SECURE_SERVICES */ -#ifdef TFM_MULTI_CORE_TEST - block TFM_SP_MULTI_CORE_TEST_LINKER_DATA, - -#if defined (TFM_PSA_API) - block TFM_SP_MULTI_CORE_TEST_LINKER_STACK, -#endif -#endif /* TFM_MULTI_CORE_TEST */ - /* * This empty, zero long execution region is here to mark the end address * of APP RoT RW and Stack. |