diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2023-07-27 04:22:27 +1000 |
|---|---|---|
| committer | Daniel Henrique Barboza <danielhb413@gmail.com> | 2023-08-04 10:50:19 -0300 |
| commit | 9915dac4847f3cc5ffd36e4c374a4eec83fe09b5 (patch) | |
| tree | f76b033828c7b46e3216352c57b9617cc000ea91 /target | |
| parent | 9201af096962a1967ce5d0b270ed16ae4edd3db6 (diff) | |
| download | qemu-9915dac4847f3cc5ffd36e4c374a4eec83fe09b5.zip qemu-9915dac4847f3cc5ffd36e4c374a4eec83fe09b5.tar.gz qemu-9915dac4847f3cc5ffd36e4c374a4eec83fe09b5.tar.bz2 | |
target/ppc: Fix pending HDEC when entering PM state
HDEC is defined to not wake from PM state. There is a check in the HDEC
timer to avoid setting the interrupt if we are in a PM state, but no
check on PM entry to lower HDEC if it already fired. This can cause a
HDECR wake up and QEMU abort with unsupported exception in Power Save
mode.
Fixes: 4b236b621bf ("ppc: Initial HDEC support")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230726182230.433945-4-npiggin@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/ppc/excp_helper.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 003805b..9aa8e46 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -2685,6 +2685,12 @@ void helper_pminsn(CPUPPCState *env, uint32_t insn) env->resume_as_sreset = (insn != PPC_PM_STOP) || (env->spr[SPR_PSSCR] & PSSCR_EC); + /* HDECR is not to wake from PM state, it may have already fired */ + if (env->resume_as_sreset) { + PowerPCCPU *cpu = env_archcpu(env); + ppc_set_irq(cpu, PPC_INTERRUPT_HDECR, 0); + } + ppc_maybe_interrupt(env); } #endif /* defined(TARGET_PPC64) */ |