From e3194f83f609bd2493c1f4466e6a063b711eebc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Date: Mon, 18 Jul 2016 17:56:59 +0200 Subject: [PATCH] UPSTREAM: arch/riscv: Change all eret instructions to .word 0x30200073 (mret) Using the opcode directly is necessary for the transition to the GCC 6.1.0 based toolchain, because the old toolchain only supports eret and the new toolchain only supports mret. BUG=None BRANCH=None TEST=None Signed-off-by: Jonathan Neuschfer Reviewed-on: https://review.coreboot.org/15290 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich Change-Id: I17e14d4793ae5259f7ce3ce0211cbb27305506cc Reviewed-on: https://chromium-review.googlesource.com/361642 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/arch/riscv/trap_util.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/arch/riscv/trap_util.S b/src/arch/riscv/trap_util.S index 0118ffcfe0..82a5629f4c 100644 --- a/src/arch/riscv/trap_util.S +++ b/src/arch/riscv/trap_util.S @@ -124,9 +124,11 @@ trap_entry: supervisor_call_return: csrr a0, mscratch restore_regs - eret # go back into supervisor call + # go back into supervisor call + .word 0x30200073 # mret .global machine_call_return machine_call_return: csrr a0, mscratch restore_regs - eret # go back into machine call + # go back into machine call + .word 0x30200073 # mret