GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64: Switch to EL2 for libpayload jump 

CQ-DEPEND=CL:216826,CL:218300
BUG=chrome-os-partner:31634
BRANCH=None
TEST=Compiles successfully and we are able to start execution of libpayload in
EL2 and reach kernel login prompt

Change-Id: I233f9867470a4723f320dc0dcaa670a56dcf0f5d
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 169948a2afeeb7848daeb37600963bd503527f1a
Original-Change-Id: I336d73085f08ca03e533555a10b88f20d74b4347
Original-Signed-off-by: Furquan Shaikh <furquan@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/217826
Original-Tested-by: Furquan Shaikh <furquan@chromium.org>
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: http://review.coreboot.org/9074
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Furquan Shaikh 2014-09-11 16:06:01 -07:00 committed by Patrick Georgi
parent 0f0b690afc
commit 441df53f83
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/arch/arm64/boot.c
View File

@ -18,17 +18,36 @@
*/ */
#include <arch/cache.h> #include <arch/cache.h>
#include <arch/lib_helpers.h>
#include <arch/stages.h> #include <arch/stages.h>
#include <arch/transition.h>
#include <cbmem.h> #include <cbmem.h>
#include <console/console.h> #include <console/console.h>
#include <program_loading.h> #include <program_loading.h>
#include <string.h>
void arch_payload_run(const struct payload *payload) void arch_payload_run(const struct payload *payload)
{ {
void (*doit)(void *) = payload->entry; void (*doit)(void *) = payload->entry;
void *cb_tables = cbmem_find(CBMEM_ID_CBTABLE); void *cb_tables = cbmem_find(CBMEM_ID_CBTABLE);
uint8_t current_el = get_current_el();
printk(BIOS_SPEW, "entry = %p\n", payload->entry); printk(BIOS_SPEW, "entry = %p\n", payload->entry);
/* If current EL is not EL3, jump to payload at same EL. */
if (current_el != EL3) {
cache_sync_instructions();
/* Point of no-return */
doit(cb_tables);
}
/* If current EL is EL3, we transition to payload in EL2. */
struct exc_state exc_state;
memset(&exc_state, 0, sizeof(exc_state));
exc_state.elx.spsr = get_eret_el(EL2, SPSR_USE_L);
cache_sync_instructions(); cache_sync_instructions();
doit(cb_tables); transition_with_entry(payload->entry, cb_tables, &exc_state);
} }