[coreboot-gerrit] Patch set updated for coreboot: arch/riscv: Unconditionally start payloads in machine mode

Jonathan Neuschäfer (j.neuschaefer@gmx.net) gerrit at coreboot.org
Sun Jul 10 04:44:24 CEST 2016


Jonathan Neuschäfer (j.neuschaefer at gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15510

-gerrit

commit 3e6938b65260583c148867e502b6794e2992cde8
Author: Jonathan Neuschäfer <j.neuschaefer at gmx.net>
Date:   Thu Jul 7 20:53:29 2016 +0200

    arch/riscv: Unconditionally start payloads in machine mode
    
    Ron Minnich writes: "we'll change cbfstool to put a header on the
    payload to jump to supervisor if that is desired. The principal here is
    that payloads are always started in machine mode, but we want to set the
    page tables up for them."
    
    Change-Id: I5cbfc90afd3febab33835935f08005136a3f47e9
    Signed-off-by: Jonathan Neuschäfer <j.neuschaefer at gmx.net>
---
 src/arch/riscv/boot.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c
index 96526bf..7435490 100644
--- a/src/arch/riscv/boot.c
+++ b/src/arch/riscv/boot.c
@@ -24,11 +24,9 @@ void arch_prog_run(struct prog *prog)
 
 	if (ENV_RAMSTAGE && prog_type(prog) == PROG_PAYLOAD) {
 		initVirtualMemory();
-		write_csr(mepc, doit);
-		asm volatile("eret");
-	} else {
-		doit(prog_entry_arg(prog));
 	}
+
+	doit(prog_entry_arg(prog));
 }
 
 int arch_supports_bounce_buffer(void)



More information about the coreboot-gerrit mailing list