From: Nicholas Piggin Date: Wed, 26 Jul 2023 18:22:27 +0000 (+1000) Subject: target/ppc: Fix pending HDEC when entering PM state X-Git-Tag: qemu-xen-4.18.0-rc5~4 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b96bb74e3a472bb7cf80789ba0a663f065534bc9;p=qemu-xen.git 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 Reviewed-by: Cédric Le Goater Message-ID: <20230726182230.433945-4-npiggin@gmail.com> Signed-off-by: Daniel Henrique Barboza (cherry picked from commit 9915dac4847f3cc5ffd36e4c374a4eec83fe09b5) Signed-off-by: Michael Tokarev --- diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index a5640060b2..9769cea7e9 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -2636,6 +2636,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) */