RISCV: modify arch_prog_run to handle payloads correctly.
Unlike the other stages, the payload requires virtual memory to be set up
and also a privelege level change.
Change-Id: Ibbe2a55f7719d917f121a53a17c6d90e6b2ab3d1
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-on: http://review.coreboot.org/11699
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c
index d07d825..ab4ae95 100644
--- a/src/arch/riscv/boot.c
+++ b/src/arch/riscv/boot.c
@@ -18,11 +18,19 @@
*/
#include <program_loading.h>
+#include <vm.h>
+#include <arch/encoding.h>
+#include <rules.h>
void arch_prog_run(struct prog *prog)
{
- void (*doit)(void *);
+ void (*doit)(void *) = prog_entry(prog);
- doit = prog_entry(prog);
- doit(prog_entry_arg(prog));
+ if (ENV_RAMSTAGE && prog_type(prog) == ASSET_PAYLOAD) {
+ initVirtualMemory();
+ write_csr(mepc, doit);
+ asm volatile("eret");
+ } else {
+ doit(prog_entry_arg(prog));
+ }
}