diff mbox series

[PULL,13/48] riscv: sifive_test: Add reset functionality

Message ID	20190918145640.17349-14-palmer@sifive.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> Date: Wed, 18 Sep 2019 07:56:05 -0700 Message-Id: <20190918145640.17349-14-palmer@sifive.com> In-Reply-To: <20190918145640.17349-1-palmer@sifive.com> References: <20190918145640.17349-1-palmer@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Palmer Dabbelt <palmer@sifive.com> To: Peter Maydell <peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 13/48] riscv: sifive_test: Add reset functionality Precedence: list Cc: Bin Meng <bmeng.cn@gmail.com>, qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Palmer Dabbelt <palmer@sifive.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	[PULL,01/48] riscv: sifive_u: Add support for loading initrd \| expand [PULL,01/48] riscv: sifive_u: Add support for loading initrd [PULL,03/48] riscv: sifive_u: Fix clock-names property for ethernet node [PULL,04/48] target/riscv/pmp: Restrict priviledged PMP to system-mode emulation [PULL,05/48] target/riscv/pmp: Convert qemu_log_mask(LOG_TRACE) to trace events [PULL,06/48] riscv: plic: Remove unused interrupt functions [PULL,07/48] target/riscv: Create function to test if FP is enabled [PULL,08/48] target/riscv: Update the Hypervisor CSRs to v0.4 [PULL,09/48] riscv: rv32: Root page table address can be larger than 32-bit [PULL,10/48] riscv: Add a helper routine for finding firmware [PULL,11/48] riscv: Resolve full path of the given bios image [PULL,12/48] riscv: hmp: Add a command to show virtual memory mappings [PULL,13/48] riscv: sifive_test: Add reset functionality [PULL,14/48] riscv: hw: Remove duplicated "hw/hw.h" inclusion [PULL,15/48] riscv: hw: Remove superfluous "linux, phandle" property [PULL,16/48] riscv: hw: Use qemu_fdt_setprop_cell() for property with only 1 cell [PULL,17/48] riscv: hw: Remove not needed PLIC properties in device tree [PULL,18/48] riscv: hw: Change create_fdt() to return void [PULL,19/48] riscv: hw: Change to use qemu_log_mask(LOG_GUEST_ERROR, ...) instead [PULL,20/48] riscv: hw: Remove the unnecessary include of target/riscv/cpu.h [PULL,22/48] riscv: sifive_u: Remove the unnecessary include of prci header [PULL,23/48] riscv: sifive: Rename sifive_prci.{c, h} to sifive_e_prci.{c, h} [PULL,24/48] riscv: sifive_e: prci: Fix a typo of hfxosccfg register programming [PULL,25/48] riscv: sifive_e: prci: Update the PRCI register block size [PULL,26/48] riscv: sifive_e: Drop sifive_mmio_emulate() [PULL,27/48] riscv: Add a sifive_cpu.h to include both E and U cpu type defines [PULL,28/48] riscv: hart: Extract hart realize to a separate routine [PULL,29/48] riscv: hart: Add a "hartid-base" property to RISC-V hart array [PULL,30/48] riscv: sifive_u: Set the minimum number of cpus to 2 [PULL,31/48] riscv: sifive_u: Update hart configuration to reflect the real FU540 SoC [PULL,32/48] riscv: sifive_u: Update PLIC hart topology configuration string [PULL,33/48] riscv: sifive: Implement PRCI model for FU540 [PULL,34/48] riscv: sifive_u: Generate hfclk and rtcclk nodes [PULL,35/48] riscv: sifive_u: Add PRCI block to the SoC [PULL,36/48] riscv: sifive_u: Reference PRCI clocks in UART and ethernet nodes [PULL,37/48] riscv: sifive_u: Update UART base addresses and IRQs [PULL,38/48] riscv: sifive_u: Change UART node name in device tree [PULL,39/48] riscv: roms: Update default bios for sifive_u machine [PULL,40/48] riscv: sifive: Implement a model for SiFive FU540 OTP [PULL,41/48] riscv: sifive_u: Instantiate OTP memory with a serial number [PULL,42/48] riscv: sifive_u: Fix broken GEM support [PULL,43/48] riscv: sifive_u: Remove handcrafted clock nodes for UART and ethernet [PULL,44/48] riscv: sifive_u: Update model and compatible strings in device tree [PULL,45/48] target/riscv: Use both register name and ABI name [PULL,46/48] target/riscv: Fix mstatus dirty mask [PULL,47/48] target/riscv: Use TB_FLAGS_MSTATUS_FS for floating point [PULL,48/48] gdbstub: riscv: fix the fflags registers

Commit Message

Palmer Dabbelt Sept. 18, 2019, 2:56 p.m. UTC

From: Bin Meng <bmeng.cn@gmail.com>

This adds a reset opcode for sifive_test device to trigger a system
reset for testing purpose.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Palmer Dabbelt <palmer@sifive.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
---
 hw/riscv/sifive_test.c         | 4 ++++
 include/hw/riscv/sifive_test.h | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/hw/riscv/sifive_test.c b/hw/riscv/sifive_test.c
index afbb3aaf34..3557e16701 100644
--- a/hw/riscv/sifive_test.c
+++ b/hw/riscv/sifive_test.c
@@ -22,6 +22,7 @@ 
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"
+#include "sysemu/runstate.h"
 #include "target/riscv/cpu.h"
 #include "hw/hw.h"
 #include "hw/riscv/sifive_test.h"
@@ -42,6 +43,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;
         }
diff --git a/include/hw/riscv/sifive_test.h b/include/hw/riscv/sifive_test.h
index 3a603a6ead..1ec416ac1b 100644
--- a/include/hw/riscv/sifive_test.h
+++ b/include/hw/riscv/sifive_test.h
@@ -36,7 +36,8 @@  typedef struct SiFiveTestState {
 
 enum {
     FINISHER_FAIL = 0x3333,
-    FINISHER_PASS = 0x5555
+    FINISHER_PASS = 0x5555,
+    FINISHER_RESET = 0x7777
 };
 
 DeviceState *sifive_test_create(hwaddr addr);