[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/7] target/ppc: Fix pending HDEC when entering PM state
From: |
Daniel Henrique Barboza |
Subject: |
[PULL 6/7] target/ppc: Fix pending HDEC when entering PM state |
Date: |
Fri, 4 Aug 2023 12:29:54 -0300 |
From: Nicholas Piggin <npiggin@gmail.com>
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>
---
target/ppc/excp_helper.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 003805b202..9aa8e46566 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) */
--
2.41.0
- [PULL 0/7] ppc queue, Daniel Henrique Barboza, 2023/08/04
- [PULL 1/7] ppc/pegasos2: Fix reset state of USB functions, Daniel Henrique Barboza, 2023/08/04
- [PULL 2/7] ppc/pegasos2: Fix reg property of ROM BARs, Daniel Henrique Barboza, 2023/08/04
- [PULL 3/7] ppc/pegasos2: Fix naming of device tree nodes, Daniel Henrique Barboza, 2023/08/04
- [PULL 7/7] target/ppc: Fix VRMA page size for ISA v3.0, Daniel Henrique Barboza, 2023/08/04
- [PULL 4/7] ppc/pegasos2: Fix reg property of 64 bit BARs in device tree, Daniel Henrique Barboza, 2023/08/04
- [PULL 5/7] target/ppc: Implement ASDR register for ISA v3.0 for HPT, Daniel Henrique Barboza, 2023/08/04
- [PULL 6/7] target/ppc: Fix pending HDEC when entering PM state,
Daniel Henrique Barboza <=
- Re: [PULL 0/7] ppc queue, Richard Henderson, 2023/08/04
- Re: [PULL 0/7] ppc queue, Michael Tokarev, 2023/08/05