Skip to contentSkip to conversation

target/ppc: Fix pending HDEC when entering PM state

PATCH New Nicholas Piggin 1 participant 1 message Jul 21, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 target/ppc/excp_helper.c | 6 ++++++
 1 file changed, 6 insertions(+)
target/ppc/excp_helper.c +6 -0
index 003805b202..9aa8e46566 100644
@@ -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) */
Signature · 1 line
2.40.1