From 140a827daa5d878d7b34853dd2b15c64c8d501d1 Mon Sep 17 00:00:00 2001 From: Jonathan Neuschäfer Date: Fri, 29 Sep 2017 01:36:58 +0200 Subject: arch/riscv: Drop mret workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Our toolchain can compile mret now, and once the encoding changes, we'll have to adjust the code anyway. Change-Id: Ic37a849f65195006fa15d74f651a8aa9a9da5b5c Signed-off-by: Jonathan Neuschäfer Reviewed-on: https://review.coreboot.org/21762 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/arch/riscv/payload.S | 5 +---- src/arch/riscv/trap_util.S | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/arch') diff --git a/src/arch/riscv/payload.S b/src/arch/riscv/payload.S index ce88bc3f64..a189adf1db 100644 --- a/src/arch/riscv/payload.S +++ b/src/arch/riscv/payload.S @@ -24,7 +24,4 @@ riscvpayload: li t2, (1<<11) or t0, t0, t2 csrw mstatus, t0 - - // We're still in toolchain no mans land. - .word 0x30200073 - //mret + mret diff --git a/src/arch/riscv/trap_util.S b/src/arch/riscv/trap_util.S index ae32379562..44cfab7c99 100644 --- a/src/arch/riscv/trap_util.S +++ b/src/arch/riscv/trap_util.S @@ -141,10 +141,10 @@ supervisor_call_return: csrr a0, mscratch restore_regs # go back into supervisor call - .word 0x30200073 # mret + mret .global machine_call_return machine_call_return: csrr a0, mscratch restore_regs # go back into machine call - .word 0x30200073 # mret + mret -- cgit v1.2.3