summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/nonsec_virt.S
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2016-06-19 04:38:31 (GMT)
committerHans de Goede <hdegoede@redhat.com>2016-07-15 13:54:56 (GMT)
commitb52813239c10d857bd262dc850232ccccdbaa69e (patch)
tree6fd2e313744dd12d62e90f5a411512a5f363c6fe /arch/arm/cpu/armv7/nonsec_virt.S
parent66ab5286736e47cc4fdec9ceab4cc1b2f24ed066 (diff)
downloadu-boot-fsl-qoriq-b52813239c10d857bd262dc850232ccccdbaa69e.tar.xz
ARM: PSCI: Split out common stack setup code from psci_arch_init
Every platform has the same stack setup code in assembly as part of psci_arch_init. Move this out into a common separate function, psci_stack_setup, for all platforms. This will allow us to move the remaining parts of psci_arch_init into C code, or drop it entirely. Also provide a stub no-op psci_arch_init for platforms that don't need their own specific setup code. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'arch/arm/cpu/armv7/nonsec_virt.S')
-rw-r--r--arch/arm/cpu/armv7/nonsec_virt.S7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
index b7563ed..95ce938 100644
--- a/arch/arm/cpu/armv7/nonsec_virt.S
+++ b/arch/arm/cpu/armv7/nonsec_virt.S
@@ -49,8 +49,13 @@ _secure_monitor:
mcr p15, 0, r5, c12, c0, 1
isb
- @ Obtain a secure stack, and configure the PSCI backend
+ @ Obtain a secure stack
+ bl psci_stack_setup
+
+ @ Configure the PSCI backend
+ push {r0, r1, r2, ip}
bl psci_arch_init
+ pop {r0, r1, r2, ip}
#endif
#ifdef CONFIG_ARM_ERRATA_773022