<p>Jonathan Neuschäfer has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21762">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">arch/riscv: Drop mret workaround<br><br>Our toolchain can compile mret now, and once the encoding changes, we'll<br>have to adjust the code anyway.<br><br>Change-Id: Ic37a849f65195006fa15d74f651a8aa9a9da5b5c<br>Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net><br>---<br>M src/arch/riscv/payload.S<br>M src/arch/riscv/trap_util.S<br>2 files changed, 3 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/21762/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/arch/riscv/payload.S b/src/arch/riscv/payload.S<br>index ce88bc3..a189adf 100644<br>--- a/src/arch/riscv/payload.S<br>+++ b/src/arch/riscv/payload.S<br>@@ -24,7 +24,4 @@<br>   li t2,  (1<<11)<br>         or t0, t0, t2<br>         csrw mstatus, t0<br>-<br>-  // We're still in toolchain no mans land.<br>-        .word 0x30200073<br>-     //mret<br>+       mret<br>diff --git a/src/arch/riscv/trap_util.S b/src/arch/riscv/trap_util.S<br>index ae32379..44cfab7 100644<br>--- a/src/arch/riscv/trap_util.S<br>+++ b/src/arch/riscv/trap_util.S<br>@@ -141,10 +141,10 @@<br>   csrr a0, mscratch<br>   restore_regs<br>   # go back into supervisor call<br>-  .word 0x30200073 # mret<br>+  mret<br>   .global machine_call_return<br> machine_call_return:<br>     csrr a0, mscratch<br>     restore_regs<br>     # go back into machine call<br>-    .word 0x30200073 # mret<br>+    mret<br></pre><p>To view, visit <a href="https://review.coreboot.org/21762">change 21762</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/21762"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ic37a849f65195006fa15d74f651a8aa9a9da5b5c </div>
<div style="display:none"> Gerrit-Change-Number: 21762 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Jonathan Neuschäfer <j.neuschaefer@gmx.net> </div>