arm64: add indirection to C entry point

To allow setting the entry point for the secondary CPUs
provide a pointer, c_entry, which contains the location
to branch to after setting up the stack.

BUG=chrome-os-partner:31545
BRANCH=None
TEST=Built and booted to the kernel on ryu.

Change-Id: I03e54b081aa5ff70b90fbd7f1b243fdb4f42c5a6
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: f692c5814ea5c7ff4895576e1db8361ff3b7d9fb
Original-Change-Id: Ic2f6c79cde708b24c379345aed1e2cc0760ccad8
Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/214771
Original-Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: http://review.coreboot.org/9015
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Aaron Durbin 2014-08-27 15:52:01 -05:00 committed by Patrick Georgi
parent 30f08ff094
commit 3a0013dcde
2 changed files with 15 additions and 1 deletions

View File

@ -20,6 +20,14 @@
#include <arch/stages.h> #include <arch/stages.h>
#include <arch/cpu.h> #include <arch/cpu.h>
/*
* This variable holds entry point for CPUs starting up. Before the other
* CPUs are brought up this value will change to provide the secondary
* code path.
*/
void (*c_entry)(void) = &arm64_init;
void __attribute__((weak)) arm64_soc_init(void) void __attribute__((weak)) arm64_soc_init(void)
{ {
/* Default weak implementation does nothing. */ /* Default weak implementation does nothing. */

View File

@ -99,7 +99,13 @@ ENTRY(arm64_c_environment)
bl cpu_get_stack bl cpu_get_stack
mov sp, x0 mov sp, x0
b arm64_init /* Get entry point by dereferencing c_entry. */
ldr x0, 1f
ldr x0, [x0]
br x0
.align 3
1:
.quad c_entry
ENDPROC(arm64_c_environment) ENDPROC(arm64_c_environment)
CPU_RESET_ENTRY(arm64_cpu_startup) CPU_RESET_ENTRY(arm64_cpu_startup)