arm64: Reorganize payload entry code and related Kconfigs

This patch slightly reorganizes arm64/boot.c with the aim of being more
readable: we need to sync the i-cache in both code paths, so do it in
a single location.

[pg: taken from patch linked below]

Change-Id: Iab173acfc6d66e4dccb6f6ab916aea2007632bfd
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 5067e47bc03f04ad2dba044f022716e0fc62bb9e
Original-Change-Id: I1b2038acc0d054716a3c580ce97ea8e9a45abfa2
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/270783
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/10246
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Julius Werner 2015-05-07 16:59:31 -07:00 committed by Patrick Georgi
parent b436ce1ac6
commit 883ec987a6
1 changed files with 2 additions and 2 deletions

View File

@ -45,11 +45,12 @@ static void run_payload(struct prog *prog)
if (IS_ENABLED(CONFIG_ARM64_USE_SPINTABLE)) if (IS_ENABLED(CONFIG_ARM64_USE_SPINTABLE))
spintable_start(); spintable_start();
cache_sync_instructions();
printk(BIOS_SPEW, "entry = %p\n", doit); printk(BIOS_SPEW, "entry = %p\n", doit);
/* If current EL is not EL3, jump to payload at same EL. */ /* If current EL is not EL3, jump to payload at same EL. */
if (current_el != EL3) { if (current_el != EL3) {
cache_sync_instructions();
/* Point of no-return */ /* Point of no-return */
doit(arg); doit(arg);
} }
@ -61,7 +62,6 @@ static void run_payload(struct prog *prog)
exc_state.elx.spsr = get_eret_el(EL2, SPSR_USE_L); exc_state.elx.spsr = get_eret_el(EL2, SPSR_USE_L);
cache_sync_instructions();
transition_with_entry(doit, arg, &exc_state); transition_with_entry(doit, arg, &exc_state);
} }
} }