diff options
| author | Helge Deller <deller@gmx.de> | 2023-06-23 08:24:30 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2023-06-24 13:39:48 +0200 |
| commit | 50ba97e928b44ff5bc731c9ffe68d86acbe44639 (patch) | |
| tree | b5592a212ce60eee0f6dd696afc789ca5baf785a | |
| parent | b455ce4c2f300c8ba47cba7232dd03261368a4cb (diff) | |
| download | qemu-50ba97e928b44ff5bc731c9ffe68d86acbe44639.zip qemu-50ba97e928b44ff5bc731c9ffe68d86acbe44639.tar.gz qemu-50ba97e928b44ff5bc731c9ffe68d86acbe44639.tar.bz2 | |
target/hppa: Fix OS reboot issues
When the OS triggers a reboot, the reset helper function sends a
qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET) together with an
EXCP_HLT exception to halt the CPUs.
So, at reboot when initializing the CPUs again, make sure to set all
instruction pointers to the firmware entry point, disable any interrupts,
disable data and instruction translations, enable PSW_Q bit and tell qemu
to unhalt (halted=0) the CPUs again.
This fixes the various reboot issues which were seen when rebooting a
Linux VM, including the case where even the monarch CPU has been virtually
halted from the OS (e.g. via "chcpu -d 0" inside the Linux VM).
Signed-off-by: Helge Deller <deller@gmx.de>
| -rw-r--r-- | hw/hppa/machine.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index b00a91e..9facef7 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -418,10 +418,16 @@ static void hppa_machine_reset(MachineState *ms, ShutdownCause reason) /* Start all CPUs at the firmware entry point. * Monarch CPU will initialize firmware, secondary CPUs - * will enter a small idle look and wait for rendevouz. */ + * will enter a small idle loop and wait for rendevouz. */ for (i = 0; i < smp_cpus; i++) { - cpu_set_pc(CPU(cpu[i]), firmware_entry); + CPUState *cs = CPU(cpu[i]); + + cpu_set_pc(cs, firmware_entry); + cpu[i]->env.psw = PSW_Q; cpu[i]->env.gr[5] = CPU_HPA + i * 0x1000; + + cs->exception_index = -1; + cs->halted = 0; } /* already initialized by machine_hppa_init()? */ |