riscv: sifive_test: Add reset functionality
Subsystems (2)
PATCH 1/1 riscv: sifive_test: Add reset functionality
This adds a reset opcode for sifive_test device to trigger a system reset for testing purpose.
---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)
hw/riscv/sifive_test.c +4 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h"
@@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }
include/hw/riscv/sifive_test.h +2 -1
@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 };DeviceState *sifive_test_create (hwaddr addr);
Signature · 1 line
2.7.4
Quoted 38 lines · Bin Meng
This adds a reset opcode for
sifive_testdevice to trigger a system reset for testing purpose.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)hw/riscv/sifive_test.c +4
-0@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" @@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }include/hw/riscv/sifive_test.h +0
-0
include/hw/riscv/sifive_test.h typedef struct SiFiveTestState { · line 38
Quoted 6 lines
include/hw/riscv/sifive_test.h +2
-1@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777
Do you mind sharing where you got this value from? I can't find details on this device in the SiFive manuals.
Alistair
Quoted 7 lines
include/hw/riscv/sifive_test.h +0
-1};DeviceState *sifive_test_create (hwaddr addr); --2.7.4
Hi Alistair,
Quoted 41 lines · Alistair Francis
Quoted 39 lines · Bin Meng
This adds a reset opcode for
sifive_testdevice to trigger a system reset for testing purpose.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)hw/riscv/sifive_test.c +4
-0@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" @@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }include/hw/riscv/sifive_test.h +0
-0@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {
Quoted 9 lines
include/hw/riscv/sifive_test.h typedef struct SiFiveTestState { · line 38
Quoted 5 lines
include/hw/riscv/sifive_test.h +2
-1enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 Do you mind sharing where you got this value from? I can't find details on this device in the SiFive manuals.
I don't think this is a device that actually exists on SiFive's chipset. It's hypothetical.
Regards,
Bin
Quoted 54 lines · On Wed, 19 Jun 2019 06:42:21 PDT (-0700), [email protected] wrote:
Hi Alistair,
Quoted 41 lines · Alistair Francis
Quoted 39 lines · Bin Meng
This adds a reset opcode for
sifive_testdevice to trigger a system reset for testing purpose.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)hw/riscv/sifive_test.c +4
-0@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" @@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }include/hw/riscv/sifive_test.h +0
-0@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {Quoted 9 lines
include/hw/riscv/sifive_test.h typedef struct SiFiveTestState { · line 38
Quoted 5 lines
include/hw/riscv/sifive_test.h +2
-1enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 Do you mind sharing where you got this value from? I can't find details on this device in the SiFive manuals.
Quoted 2 lines
I don't think this is a device that actually exists on SiFive's chipset. It's hypothetical.
The device actually does exist in the hardware, but that's just an implementation quirk. Essentially what's going on here is that the RTL contains this device, which has a register and then a behavioral verilog block that causes simulations to terminate. This is how we exit from tests in RTL simulation, and we've just gone ahead and implemented the same device in QEMU in order to make it easy to have compatibility with those bare-metal tests. Due to how our design flow is set up we end up with exactly the same block in the ASIC. The register is still there, but the behavioral code to exit simulations doesn't do anything so it's essentially just a useless device. Since it's useless we don't bother writing it up in the ASIC documentation, but it should be in the RTL documentation.
I'm not opposed to extending the interface in the suggested fashion, but I wanted to check with the hardware team first to see if they're doing anything with the other numbers. I'm out of the office (and somewhat backed up on code review) until July, so it might take a bit to dig through this.
Hi Palmer,
Quoted 71 lines · Palmer Dabbelt
Quoted 54 lines · On Wed, 19 Jun 2019 06:42:21 PDT (-0700), [email protected] wrote:
Hi Alistair,
Quoted 41 lines · Alistair Francis
Quoted 39 lines · Bin Meng
This adds a reset opcode for
sifive_testdevice to trigger a system reset for testing purpose.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)hw/riscv/sifive_test.c +4
-0@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" @@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }include/hw/riscv/sifive_test.h +0
-0@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {Quoted 9 lines
include/hw/riscv/sifive_test.h typedef struct SiFiveTestState { · line 38
Quoted 5 lines
include/hw/riscv/sifive_test.h +2
-1enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 Do you mind sharing where you got this value from? I can't find details on this device in the SiFive manuals.
Quoted 2 lines
I don't think this is a device that actually exists on SiFive's chipset. It's hypothetical.
The device actually does exist in the hardware, but that's just an implementation quirk. Essentially what's going on here is that the RTL contains this device, which has a register and then a behavioral verilog block that causes simulations to terminate. This is how we exit from tests in RTL simulation, and we've just gone ahead and implemented the same device in QEMU in order to make it easy to have compatibility with those bare-metal tests. Due to how our design flow is set up we end up with exactly the same block in the ASIC. The register is still there, but the behavioral code to exit simulations doesn't do anything so it's essentially just a useless device. Since it's useless we don't bother writing it up in the ASIC documentation, but it should be in the RTL documentation.
Quoted 4 lines
I'm not opposed to extending the interface in the suggested fashion, but I wanted to check with the hardware team first to see if they're doing anything with the other numbers. I'm out of the office (and somewhat backed up on code review) until July, so it might take a bit to dig through this.
Thanks for the clarification. The main reason of adding this functionality is to provide software a way of rebooting the whole system. Please provide update after you consult SiFive hardware guys :)
Regards,
Bin
Quoted 79 lines · On Thu, 20 Jun 2019 22:40:24 PDT (-0700), [email protected] wrote:
Hi Palmer,
Quoted 71 lines · Palmer Dabbelt
Quoted 54 lines · On Wed, 19 Jun 2019 06:42:21 PDT (-0700), [email protected] wrote:
Hi Alistair,
Quoted 41 lines · Alistair Francis
Quoted 39 lines · Bin Meng
This adds a reset opcode for
sifive_testdevice to trigger a system reset for testing purpose.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)hw/riscv/sifive_test.c +4
-0@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" @@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }include/hw/riscv/sifive_test.h +0
-0@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {Quoted 9 lines
include/hw/riscv/sifive_test.h typedef struct SiFiveTestState { · line 38
Quoted 5 lines
include/hw/riscv/sifive_test.h +2
-1enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 Do you mind sharing where you got this value from? I can't find details on this device in the SiFive manuals.
Quoted 2 lines
I don't think this is a device that actually exists on SiFive's chipset. It's hypothetical.
The device actually does exist in the hardware, but that's just an implementation quirk. Essentially what's going on here is that the RTL contains this device, which has a register and then a behavioral verilog block that causes simulations to terminate. This is how we exit from tests in RTL simulation, and we've just gone ahead and implemented the same device in QEMU in order to make it easy to have compatibility with those bare-metal tests. Due to how our design flow is set up we end up with exactly the same block in the ASIC. The register is still there, but the behavioral code to exit simulations doesn't do anything so it's essentially just a useless device. Since it's useless we don't bother writing it up in the ASIC documentation, but it should be in the RTL documentation.
Quoted 4 lines
I'm not opposed to extending the interface in the suggested fashion, but I wanted to check with the hardware team first to see if they're doing anything with the other numbers. I'm out of the office (and somewhat backed up on code review) until July, so it might take a bit to dig through this.
Quoted 4 lines
Thanks for the clarification. The main reason of adding this functionality is to provide software a way of rebooting the whole system. Please provide update after you consult SiFive hardware guys :)
Ya, it makes sense. My only worry here is that we have some way of doing this already, in which case I'd just want to make sure it matches.
Hi Palmer,
Quoted 81 lines · Palmer Dabbelt
Quoted 79 lines · On Thu, 20 Jun 2019 22:40:24 PDT (-0700), [email protected] wrote:
Hi Palmer,
Quoted 75 lines · Palmer Dabbelt
Quoted 54 lines · On Wed, 19 Jun 2019 06:42:21 PDT (-0700), [email protected] wrote:
Hi Alistair,
Quoted 41 lines · Alistair Francis
Quoted 39 lines · Bin Meng
This adds a reset opcode for
sifive_testdevice to trigger a system reset for testing purpose.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)hw/riscv/sifive_test.c +4
-0@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" @@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }include/hw/riscv/sifive_test.h +0
-0@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {Quoted 9 lines
include/hw/riscv/sifive_test.h typedef struct SiFiveTestState { · line 38
Quoted 5 lines
include/hw/riscv/sifive_test.h +2
-1enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 Do you mind sharing where you got this value from? I can't find details on this device in the SiFive manuals.
Quoted 2 lines
I don't think this is a device that actually exists on SiFive's chipset. It's hypothetical.
The device actually does exist in the hardware, but that's just an implementation quirk. Essentially what's going on here is that the RTL contains this device, which has a register and then a behavioral verilog block that causes simulations to terminate. This is how we exit from tests in RTL simulation, and we've just gone ahead and implemented the same device in QEMU in order to make it easy to have compatibility with those bare-metal tests. Due to how our design flow is set up we end up with exactly the same block in the ASIC. The register is still there, but the behavioral code to exit simulations doesn't do anything so it's essentially just a useless device. Since it's useless we don't bother writing it up in the ASIC documentation, but it should be in the RTL documentation.
I'm not opposed to extending the interface in the suggested fashion, but I wanted to check with the hardware team first to see if they're doing anything with the other numbers. I'm out of the office (and somewhat backed up on code review) until July, so it might take a bit to dig through this.
Quoted 7 lines
Quoted 4 lines
Thanks for the clarification. The main reason of adding this functionality is to provide software a way of rebooting the whole system. Please provide update after you consult SiFive hardware guys :)
Ya, it makes sense. My only worry here is that we have some way of doing this already, in which case I'd just want to make sure it matches.
If the SiFive chipset already has the functionality to do the reset via this test module, I agree let's align the number to what hardware actually accepts.
Regards,
Bin
Quoted 37 lines · On Fri, 14 Jun 2019 08:15:51 PDT (-0700), [email protected] wrote:
This adds a reset opcode for
sifive_testdevice to trigger a system reset for testing purpose.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)hw/riscv/sifive_test.c +4
-0@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" @@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }include/hw/riscv/sifive_test.h +0
-0
include/hw/riscv/sifive_test.h typedef struct SiFiveTestState { · line 41
Quoted 9 lines
include/hw/riscv/sifive_test.h +2
-1@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 };DeviceState *sifive_test_create (hwaddr addr);
Poking around the hardware side, it looks like we're silently ignoring all codes aside from 0x3333 and 0x5555. As a result there's really no way to test if this added reset is going to work, so this should be a "sifive,test1" instead of a "sifive,test0". It's backwards compatible, so the compat string in the device trees should look something like
compatible = "sifive,test1", "sifive,test0";
With that it should be fine, pending the change to our hardware to reserve this as an error code within "sifive,test0" devices.
Do you mind also submitting a device tree binding to Linux that describes this device? That way we can all stay on the same page about what the pair of interfaces do.
Thanks!
Quoted 55 lines · Palmer Dabbelt
Quoted 37 lines · On Fri, 14 Jun 2019 08:15:51 PDT (-0700), [email protected] wrote:
This adds a reset opcode for
sifive_testdevice to trigger a system reset for testing purpose.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)hw/riscv/sifive_test.c +4
-0@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" @@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }include/hw/riscv/sifive_test.h +0
-0include/hw/riscv/sifive_test.h typedef struct SiFiveTestState { · line 41
Quoted 9 lines
include/hw/riscv/sifive_test.h +2
-1@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 };DeviceState *sifive_test_create (hwaddr addr);Poking around the hardware side, it looks like we're silently ignoring all codes aside from
0x3333and0x5555. As a result there's really no way to test if this added reset is going to work, so this should be a "sifive,test1" instead of a "sifive,test0". It's backwards compatible, so the compat string in the device trees should look something like
Quoted 8 lines
compatible = "sifive,test1", "sifive,test0";With that it should be fine, pending the change to our hardware to reserve this as an error code within "sifive,test0" devices.
Do you mind also submitting a device tree binding to Linux that describes this device? That way we can all stay on the same page about what the pair of interfaces do.
Thanks for the confirmation. I will try to create a device tree binding for Linux.
Regards,
Bin
Quoted 37 lines · On Fri, 14 Jun 2019 08:15:51 PDT (-0700), [email protected] wrote:
This adds a reset opcode for
sifive_testdevice to trigger a system reset for testing purpose.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)hw/riscv/sifive_test.c +4
-0@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" @@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }include/hw/riscv/sifive_test.h +0
-0
include/hw/riscv/sifive_test.h typedef struct SiFiveTestState { · line 41
Quoted 9 lines
include/hw/riscv/sifive_test.h +2
-1@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 };DeviceState *sifive_test_create (hwaddr addr);
Sorry this took a while, but it's in the hardware now. I'll merge this, but I'm considering it a new feature so it'll be held off a bit.
Thanks!
Hi Palmer,
Quoted 47 lines · Palmer Dabbelt
Quoted 45 lines · On Fri, 14 Jun 2019 08:15:51 PDT (-0700), [email protected] wrote:
This adds a reset opcode for
sifive_testdevice to trigger a system reset for testing purpose.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)hw/riscv/sifive_test.c +4
-0@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" @@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }include/hw/riscv/sifive_test.h +2
-1@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 };
Quoted 3 lines
include/hw/riscv/sifive_test.h typedef struct SiFiveTestState { · line 41
Quoted 1 line
include/hw/riscv/sifive_test.h +0
-0DeviceState *sifive_test_create (hwaddr addr);Reviewed-by Palmer Dabbelt <[email protected]>
Thanks a lot!
Quoted 2 lines
Sorry this took a while, but it's in the hardware now. I'll merge this, but I'm considering it a new feature so it'll be held off a bit.
"but it's in the hardware now", do you mean the code I added (0x7777) is now supported by a newer version SiFive test device with compatible string "sifive,test1", and can actually do the system wide reset?
Regards,
Bin
Quoted 54 lines · On Mon, 22 Jul 2019 22:30:15 PDT (-0700), [email protected] wrote:
Hi Palmer,
Quoted 47 lines · Palmer Dabbelt
Quoted 45 lines · On Fri, 14 Jun 2019 08:15:51 PDT (-0700), [email protected] wrote:
This adds a reset opcode for
sifive_testdevice to trigger a system reset for testing purpose.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)hw/riscv/sifive_test.c +4
-0@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" @@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }include/hw/riscv/sifive_test.h +2
-1@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 };Quoted 3 lines
include/hw/riscv/sifive_test.h typedef struct SiFiveTestState { · line 41
Quoted 1 line
include/hw/riscv/sifive_test.h +0
-0DeviceState *sifive_test_create (hwaddr addr);Reviewed-by Palmer Dabbelt <[email protected]>
Quoted 8 lines
Thanks a lot!
Quoted 2 lines
Sorry this took a while, but it's in the hardware now. I'll merge this, but I'm considering it a new feature so it'll be held off a bit.
"but it's in the hardware now", do you mean the code I added (
0x7777) is now supported by a newer version SiFive test device with compatible string "sifive,test1", and can actually do the system wide reset?
No, the hardware is still a "sifive,test0" as plumbing through the reset is trickier than I wanted to take on. I just reserved the 0x7777 code and implemented it by triggering an unsupported function error, so we don't accidentally use it for something else later.
Quoted 61 lines · Palmer Dabbelt
Quoted 59 lines · On Mon, 22 Jul 2019 22:30:15 PDT (-0700), [email protected] wrote:
Hi Palmer,
Quoted 47 lines · Palmer Dabbelt
Quoted 45 lines · On Fri, 14 Jun 2019 08:15:51 PDT (-0700), [email protected] wrote:
This adds a reset opcode for
sifive_testdevice to trigger a system reset for testing purpose.Signed-off-by Bin Meng <[email protected]>---
hw/riscv/sifive_test.c | 4 ++++ include/hw/riscv/sifive_test.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)hw/riscv/sifive_test.c +4
-0@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" @@ -40,6 +41,9 @@ static void sifive_test_write(void *opaque, hwaddr addr,exit (code);case FINISHER_PASS :exit (0 ); +case FINISHER_RESET : +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +return ;default :break ; }include/hw/riscv/sifive_test.h +2
-1@@ -34,7 +34,8 @@ typedef struct SiFiveTestState {enum {FINISHER_FAIL =0x3333 , -FINISHER_PASS =0x5555 +FINISHER_PASS =0x5555 , +FINISHER_RESET =0x7777 };Quoted 3 lines
include/hw/riscv/sifive_test.h typedef struct SiFiveTestState { · line 41
Quoted 1 line
include/hw/riscv/sifive_test.h +0
-0DeviceState *sifive_test_create (hwaddr addr);Reviewed-by Palmer Dabbelt <[email protected]>Thanks a lot!
Quoted 2 lines
Sorry this took a while, but it's in the hardware now. I'll merge this, but I'm considering it a new feature so it'll be held off a bit.
Quoted 8 lines
Quoted 3 lines
"but it's in the hardware now", do you mean the code I added (
0x7777) is now supported by a newer version SiFive test device with compatible string "sifive,test1", and can actually do the system wide reset?No, the hardware is still a "sifive,test0" as plumbing through the reset is trickier than I wanted to take on. I just reserved the
0x7777code and implemented it by triggering an unsupported function error, so we don't accidentally use it for something else later.
OK, thanks for the clarifications!
Regards,
Bin