Skip to contentSkip to conversation

target/openrisc: implement shutdown and reset helpers

PATCH New Jason A. Donenfeld 3 participants 5 messages May 2, 2022 – May 3, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/openrisc: implement shutdown and reset helpers

OpenRISC defines various nop instructions in or1k as meaning shutdown or reset. Implement these in TCG. This has been tested with Linux and confirmed to work.

---
 target/openrisc/helper.h     |  1 +
 target/openrisc/sys_helper.c | 18 ++++++++++++++++++
 target/openrisc/translate.c  |  1 +
 3 files changed, 20 insertions(+)
target/openrisc/helper.h +1 -0
index d847814a28..ea3557b3f9 100644
@@ -64,3 +64,4 @@ DEF_HELPER_FLAGS_1(rfe, 0, void, env)
 /* sys */
 DEF_HELPER_FLAGS_3(mtspr, 0, void, env, tl, tl)
 DEF_HELPER_FLAGS_3(mfspr, TCG_CALL_NO_WG, tl, env, tl, tl)
+DEF_HELPER_1(nop, void, i32)
target/openrisc/sys_helper.c +18 -0
index 48674231e7..f6249896fb 100644
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "sysemu/runstate.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "exec/helper-proto.h"
@@ -314,3 +315,20 @@ target_ulong HELPER(mfspr)(CPUOpenRISCState *env, target_ulong rd,
     /* for rd is passed in, if rd unchanged, just keep it back.  */
     return rd;
 }
+
+void HELPER(nop)(uint32_t arg)
+{
+#ifndef CONFIG_USER_ONLY
+	switch (arg) {
+	case 0x001: /* NOP_EXIT */
+	case 0x00c: /* NOP_EXIT_SILENT */
+		qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
+		break;
+	case 0x00d: /* NOP_RESET */
+		qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
+		break;
+	default:
+		break;
+	}
+#endif
+}
target/openrisc/translate.c +1 -0
index 7b8ad43d5f..2e4f3759d4 100644
@@ -780,6 +780,7 @@ static bool trans_l_sh(DisasContext *dc, arg_store *a)
 
 static bool trans_l_nop(DisasContext *dc, arg_l_nop *a)
 {
+    gen_helper_nop(cpu_R(dc, a->k));
     return true;
 }
 
Signature · 1 line
2.35.1
#1 lore raw

PATCH 1/1 target/openrisc: implement shutdown and reset helpers

Quoted 3 lines · Jason A. Donenfeld

OpenRISC defines various nop instructions in or1k as meaning shutdown or reset. Implement these in TCG. This has been tested with Linux and confirmed to work.

No, OpenRISC does not define various nop instructions, etc.

OpenRISC defines a Power Management Register to handle doze and suspend; there is no specification for shutdown or reset.

See https://openrisc.io/architecture

r~

#2 lore raw

PATCH 1/1 target/openrisc: implement shutdown and reset helpers

Quoted 11 lines · Richard Henderson
Quoted 3 lines · Jason A. Donenfeld

OpenRISC defines various nop instructions in or1k as meaning shutdown or reset. Implement these in TCG. This has been tested with Linux and confirmed to work.

No, OpenRISC does not define various nop instructions, etc.

OpenRISC defines a Power Management Register to handle doze and suspend; there is no specification for shutdown or reset.

See https://openrisc.io/architecture

Stafford is in the process of documenting/spec'ing the nop stuff.

Quoted 4 lines

r~

#3 lore raw

PATCH 1/1 target/openrisc: implement shutdown and reset helpers

Quoted 8 lines · Jason A. Donenfeld
Quoted 7 lines · Richard Henderson
Quoted 3 lines · Jason A. Donenfeld

OpenRISC defines various nop instructions in or1k as meaning shutdown or reset. Implement these in TCG. This has been tested with Linux and confirmed to work.

No, OpenRISC does not define various nop instructions, etc.

Quoted 7 lines
Quoted 4 lines

OpenRISC defines a Power Management Register to handle doze and suspend; there is no specification for shutdown or reset.

See https://openrisc.io/architecture

Stafford is in the process of documenting/spec'ing the nop stuff.

Hi Richard,

Yes, we had a mail discussion about this with Peter. This being similar to ARM semihosting; enabling these special instructions should be behind the semihosting flag. Something that needs to be done for this patch.

If you have concern about this let me now.

Mail:
- https://www.mail-archive.com/qemu-devel at nongnu.org/msg884560.html

Our other simulators implement this, so the compromise is if we document this officially and only implement it behind semihosting peter was OK with it.

I haven't started on the documentation yet as I haven't has much time in the last few days though.

Or1ksim:
- https://github.com/openrisc/or1ksim/blob/79c6f153390127e50259d46a7cc0421aa787d2ed/cpu/or32/insnset.c#L768
sim:
- https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=sim/or1k/or1k.c;h=bfab35461bee1457fe8f42179ac6d27f5ad46b96;hb=HEAD

-Stafford

#4 lore raw

PATCH 1/1 target/openrisc: implement shutdown and reset helpers

Quoted 3 lines · Stafford Horne

Yes, we had a mail discussion about this with Peter. This being similar to ARM semihosting; enabling these special instructions should be behind the semihosting flag. Something that needs to be done for this patch.

Ah, ok.

Quoted 10 lines

Our other simulators implement this, so the compromise is if we document this officially and only implement it behind semihosting peter was OK with it.

I haven't started on the documentation yet as I haven't has much time in the last few days though.

Or1ksim:
- https://github.com/openrisc/or1ksim/blob/79c6f153390127e50259d46a7cc0421aa787d2ed/cpu/or32/insnset.c#L768
sim:
- https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=sim/or1k/or1k.c;h=bfab35461bee1457fe8f42179ac6d27f5ad46b96;hb=HEAD

Thanks for the pointers.

r~