aboutsummaryrefslogtreecommitdiff
path: root/plat/common
diff options
context:
space:
mode:
authorAlexei Fedorov <Alexei.Fedorov@arm.com>2020-10-29 18:00:13 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-10-29 18:00:13 +0000
commit8109d2dd69e2e08c36a094776d37151a65bf37fb (patch)
tree8923be0e02560f252a1c98ffb5d218fe0b7767aa /plat/common
parent271708e06462a13eb163efc61ed1fe82a002192c (diff)
parent3ed5606bd1156e61241b57cb2dcceb90f75f6332 (diff)
downloadtrusted-firmware-a-8109d2dd69e2e08c36a094776d37151a65bf37fb.tar.gz
Merge "Use constant stack size with RECLAIM_INIT_CODE" into integrationv2.4-rc0
Diffstat (limited to 'plat/common')
-rw-r--r--plat/common/aarch64/platform_mp_stack.S33
1 files changed, 0 insertions, 33 deletions
diff --git a/plat/common/aarch64/platform_mp_stack.S b/plat/common/aarch64/platform_mp_stack.S
index ee0dbb4f62..c34a4cf3b1 100644
--- a/plat/common/aarch64/platform_mp_stack.S
+++ b/plat/common/aarch64/platform_mp_stack.S
@@ -32,42 +32,9 @@
* -----------------------------------------------------
*/
func plat_get_my_stack
-#if (defined(IMAGE_BL31) && RECLAIM_INIT_CODE)
-#if (PLATFORM_CORE_COUNT == 1)
- /* Single CPU */
- adrp x0, __PRIMARY_STACK__
- add x0, x0, :lo12:__PRIMARY_STACK__
- ret
-#else
- mov x10, x30
- bl plat_my_core_pos
- cbnz x0, 2f
-
- /* Primary CPU */
- adrp x0, __PRIMARY_STACK__
- add x0, x0, :lo12:__PRIMARY_STACK__
- ret x10
-
- /* Secondary CPU */
-2: sub x0, x0, #(PLATFORM_CORE_COUNT - 1)
- adrp x1, __STACKS_END__
- adrp x2, __STACK_SIZE__
- add x1, x1, :lo12:__STACKS_END__
- add x2, x2, :lo12:__STACK_SIZE__
-
- madd x0, x0, x2, x1
- bic x0, x0, #(CACHE_WRITEBACK_GRANULE - 1)
- ret x10
-#endif
- /* Prevent linker from removal of stack section */
- .quad platform_normal_stacks
-
-#else /* !(IMAGE_BL31 && RECLAIM_INIT_CODE) */
mov x10, x30
get_my_mp_stack platform_normal_stacks, PLATFORM_STACK_SIZE
ret x10
-
-#endif /* IMAGE_BL31 && RECLAIM_INIT_CODE */
endfunc plat_get_my_stack
/* -----------------------------------------------------