Skip to contentSkip to conversation

openrisc: define nop command for simulator reboot

PATCH In review Jason A. Donenfeld 2 participants 4 messages Apr 28, 2022 – Apr 30, 2022 Openrisc architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 openrisc: define nop command for simulator reboot

The simulator defines l.nop 1 for shutdown, but doesn't have anything for reboot. Use 13 for this, which is currently unused, dubbed NOP_REBOOT.

---
 arch/openrisc/kernel/process.c | 2 ++
 1 file changed, 2 insertions(+)
arch/openrisc/kernel/process.c +2 -0
index 3c0c91bcdcba..4cce95fa6eb5 100644
@@ -52,6 +52,8 @@ void machine_restart(char *cmd)
 {
 	do_kernel_restart(cmd);
 
+	__asm__("l.nop 13");
+
 	/* Give a grace period for failure to restart of 1s */
 	mdelay(1000);
 
Signature · 1 line
2.35.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 27 lines · Jason A. Donenfeld

The simulator defines l.nop 1 for shutdown, but doesn't have anything for reboot. Use 13 for this, which is currently unused, dubbed NOP_REBOOT.

---
 arch/openrisc/kernel/process.c | 2 ++
 1 file changed, 2 insertions(+)
arch/openrisc/kernel/process.c +2 -0
index 3c0c91bcdcba..4cce95fa6eb5 100644
@@ -52,6 +52,8 @@ void machine_restart(char *cmd)
 {
 	do_kernel_restart(cmd);
 
+	__asm__("l.nop 13");
+
 	/* Give a grace period for failure to restart of 1s */
 	mdelay(1000);
 
Signature · 1 line
2.35.1

This seems fair, probably it would be good to have a comment mentioninmg what the nop is for, fyi for context these are the nop numbers used to control simulations.

    #define NOP_NOP          0x0000      /* Normal nop instruction */
    #define NOP_EXIT         0x0001      /* End of simulation */
    #define NOP_REPORT       0x0002      /* Simple report */
    /*#define NOP_PRINTF       0x0003       Simprintf instruction (obsolete)*/
    #define NOP_PUTC         0x0004      /* JPB: Simputc instruction */
    #define NOP_CNT_RESET    0x0005      /* Reset statistics counters */
    #define NOP_GET_TICKS    0x0006      /* JPB: Get # ticks running */
    #define NOP_GET_PS       0x0007      /* JPB: Get picosecs/cycle */
    #define NOP_TRACE_ON     0x0008      /* Turn on tracing */
    #define NOP_TRACE_OFF    0x0009      /* Turn off tracing */
    #define NOP_RANDOM       0x000a      /* Return 4 random bytes */
    #define NOP_OR1KSIM      0x000b      /* Return non-zero if this is Or1ksim */
    #define NOP_EXIT_SILENT  0x000c      /* End of simulation, quiet version */
    /* New! */
    #define NOP_RESET        0x000d      /* Reset the cpu */

I will queue this once we update the spec to define some of these, I am thinking if qemu should allow for the shutdown to work in user mode.

BTW, are you working specifically on openrisc? Or just setting up test environments for all architectures?

#2 lore raw
Quoted 33 lines · Stafford Horne
Quoted 27 lines · Jason A. Donenfeld

The simulator defines l.nop 1 for shutdown, but doesn't have anything for reboot. Use 13 for this, which is currently unused, dubbed NOP_REBOOT.

---
 arch/openrisc/kernel/process.c | 2 ++
 1 file changed, 2 insertions(+)
arch/openrisc/kernel/process.c +2 -0
index 3c0c91bcdcba..4cce95fa6eb5 100644
@@ -52,6 +52,8 @@ void machine_restart(char *cmd)
 {
 	do_kernel_restart(cmd);
 
+	__asm__("l.nop 13");
+
 	/* Give a grace period for failure to restart of 1s */
 	mdelay(1000);
 
Signature · 1 line
2.35.1

This seems fair, probably it would be good to have a comment mentioninmg what the nop is for, fyi for context these are the nop numbers used to control simulations.

Quoted 15 lines
    #define NOP_NOP          0x0000      /* Normal nop instruction */
    #define NOP_EXIT         0x0001      /* End of simulation */
    #define NOP_REPORT       0x0002      /* Simple report */
    /*#define NOP_PRINTF       0x0003       Simprintf instruction (obsolete)*/
    #define NOP_PUTC         0x0004      /* JPB: Simputc instruction */
    #define NOP_CNT_RESET    0x0005      /* Reset statistics counters */
    #define NOP_GET_TICKS    0x0006      /* JPB: Get # ticks running */
    #define NOP_GET_PS       0x0007      /* JPB: Get picosecs/cycle */
    #define NOP_TRACE_ON     0x0008      /* Turn on tracing */
    #define NOP_TRACE_OFF    0x0009      /* Turn off tracing */
    #define NOP_RANDOM       0x000a      /* Return 4 random bytes */
    #define NOP_OR1KSIM      0x000b      /* Return non-zero if this is Or1ksim */
    #define NOP_EXIT_SILENT  0x000c      /* End of simulation, quiet version */
    /* New! */
    #define NOP_RESET        0x000d      /* Reset the cpu */

Right, that's where I got 13 from. By the way, the .tex file only mentions ones up to 11, so at first I chose 12, and then saw this file.

Quoted 6 lines

I will queue this once we update the spec to define some of these, I am thinking if qemu should allow for the shutdown to work in user mode.

BTW, are you working specifically on openrisc? Or just setting up test environments for all architectures?

Trying to get OpenRISC up on https://build.wireguard.com/ . The other architectures were simple, but OpenRISC is requiring some work...

Jason

maintainer
#3 lore raw
Quoted 50 lines · Jason A. Donenfeld
Quoted 33 lines · Stafford Horne
Quoted 27 lines · Jason A. Donenfeld

The simulator defines l.nop 1 for shutdown, but doesn't have anything for reboot. Use 13 for this, which is currently unused, dubbed NOP_REBOOT.

---
 arch/openrisc/kernel/process.c | 2 ++
 1 file changed, 2 insertions(+)
arch/openrisc/kernel/process.c +2 -0
index 3c0c91bcdcba..4cce95fa6eb5 100644
@@ -52,6 +52,8 @@ void machine_restart(char *cmd)
 {
 	do_kernel_restart(cmd);
 
+	__asm__("l.nop 13");
+
 	/* Give a grace period for failure to restart of 1s */
 	mdelay(1000);
 
Signature · 1 line
2.35.1

This seems fair, probably it would be good to have a comment mentioninmg what the nop is for, fyi for context these are the nop numbers used to control simulations.

Quoted 15 lines
    #define NOP_NOP          0x0000      /* Normal nop instruction */
    #define NOP_EXIT         0x0001      /* End of simulation */
    #define NOP_REPORT       0x0002      /* Simple report */
    /*#define NOP_PRINTF       0x0003       Simprintf instruction (obsolete)*/
    #define NOP_PUTC         0x0004      /* JPB: Simputc instruction */
    #define NOP_CNT_RESET    0x0005      /* Reset statistics counters */
    #define NOP_GET_TICKS    0x0006      /* JPB: Get # ticks running */
    #define NOP_GET_PS       0x0007      /* JPB: Get picosecs/cycle */
    #define NOP_TRACE_ON     0x0008      /* Turn on tracing */
    #define NOP_TRACE_OFF    0x0009      /* Turn off tracing */
    #define NOP_RANDOM       0x000a      /* Return 4 random bytes */
    #define NOP_OR1KSIM      0x000b      /* Return non-zero if this is Or1ksim */
    #define NOP_EXIT_SILENT  0x000c      /* End of simulation, quiet version */
    /* New! */
    #define NOP_RESET        0x000d      /* Reset the cpu */
Quoted 2 lines

Right, that's where I got 13 from. By the way, the .tex file only mentions ones up to 11, so at first I chose 12, and then saw this file.

BTW, I have queued this for 5.19.

Quoted 9 lines
Quoted 6 lines

I will queue this once we update the spec to define some of these, I am thinking if qemu should allow for the shutdown to work in user mode.

BTW, are you working specifically on openrisc? Or just setting up test environments for all architectures?

Trying to get OpenRISC up on https://build.wireguard.com/ . The other architectures were simple, but OpenRISC is requiring some work...

Thanks, any work is appreciated. Now, I am going to go and replace my openVPN setup with wireguard.

-Stafford