qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Nicholas Piggin <npiggin@gmail.com>
To: Daniel Henrique Barboza <danielhb413@gmail.com>
Cc: "Nicholas Piggin" <npiggin@gmail.com>,
	"Cédric Le Goater" <clg@kaod.org>,
	"David Gibson" <david@gibson.dropbear.id.au>,
	"Greg Kurz" <groug@kaod.org>,
	"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
	qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Subject: [PATCH 3/6] target/ppc: Fix pending HDEC when entering PM state
Date: Thu, 27 Jul 2023 04:22:27 +1000	[thread overview]
Message-ID: <20230726182230.433945-4-npiggin@gmail.com> (raw)
In-Reply-To: <20230726182230.433945-1-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>
---
 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.40.1



  parent reply	other threads:[~2023-07-26 19:25 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-26 18:22 [PATCH 0/6] ppc fixes possibly for 8.1 Nicholas Piggin
2023-07-26 18:22 ` [PATCH 1/6] target/ppc: Implement ASDR register for ISA v3.0 for HPT Nicholas Piggin
2023-07-27 13:22   ` Cédric Le Goater
2023-07-26 18:22 ` [PATCH 2/6] target/ppc: Fix VRMA page size for ISA v3.0 Nicholas Piggin
2023-07-27 13:07   ` Cédric Le Goater
2023-07-26 18:22 ` Nicholas Piggin [this message]
2023-07-27 12:57   ` [PATCH 3/6] target/ppc: Fix pending HDEC when entering PM state Cédric Le Goater
2023-07-26 18:22 ` [PATCH 4/6] hw/ppc: Avoid decrementer rounding errors Nicholas Piggin
2023-07-26 18:22 ` [PATCH 5/6] hw/ppc: Always store the decrementer value Nicholas Piggin
2023-07-27 12:26   ` Cédric Le Goater
2023-07-30  9:40     ` Nicholas Piggin
2023-07-30 16:18       ` Cédric Le Goater
2023-07-26 18:22 ` [PATCH 6/6] target/ppc: Migrate DECR SPR Nicholas Piggin
2023-07-28 20:05 ` [PATCH 0/6] ppc fixes possibly for 8.1 Daniel Henrique Barboza

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230726182230.433945-4-npiggin@gmail.com \
    --to=npiggin@gmail.com \
    --cc=clg@kaod.org \
    --cc=danielhb413@gmail.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=groug@kaod.org \
    --cc=harshpb@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).