From: David Gibson <david@gibson.dropbear.id.au>
To: Nicholas Piggin <npiggin@gmail.com>
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org,
"Cédric Le Goater" <clg@kaod.org>
Subject: Re: [PATCH] ppc/pnv: Fix NMI system reset SRR1 value
Date: Thu, 7 May 2020 23:51:54 +1000 [thread overview]
Message-ID: <20200507135154.GA2282@umbus.fritz.box> (raw)
In-Reply-To: <20200507114824.788942-1-npiggin@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2669 bytes --]
On Thu, May 07, 2020 at 09:48:24PM +1000, Nicholas Piggin wrote:
> Commit a77fed5bd926 ("ppc/pnv: Add support for NMI interface") got the
> SRR1 setting wrong for sresets that hit outside of power-save states.
>
> Fix this, better documenting the source for the bit definitions.
>
> Fixes: a77fed5bd926 ("ppc/pnv: Add support for NMI interface") got the
> Cc: Cédric Le Goater <clg@kaod.org>
> Cc: David Gibson <david@gibson.dropbear.id.au>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Applied to ppc-for-5.1, thanks.
> ---
>
> Thanks to Cedric for pointing out concerns with a previous MCE patch
> that unearthed this as well. Linux does not actually care what these
> SRR1[42:45] bits look like for non-powersave sresets, but we should
> follow documented behaviour as far as possible.
>
> hw/ppc/pnv.c | 26 ++++++++++++++++++++------
> 1 file changed, 20 insertions(+), 6 deletions(-)
>
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index a3b7a8d0ff..1b4748ce6d 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -1986,12 +1986,26 @@ static void pnv_cpu_do_nmi_on_cpu(CPUState *cs, run_on_cpu_data arg)
>
> cpu_synchronize_state(cs);
> ppc_cpu_do_system_reset(cs);
> - /*
> - * SRR1[42:45] is set to 0100 which the ISA defines as implementation
> - * dependent. POWER processors use this for xscom triggered interrupts,
> - * which come from the BMC or NMI IPIs.
> - */
> - env->spr[SPR_SRR1] |= PPC_BIT(43);
> + if (env->spr[SPR_SRR1] & PPC_BITMASK(46, 47)) {
> + /*
> + * Power-save wakeups, as indicated by non-zero SRR1[46:47] put the
> + * wakeup reason in SRR1[42:45], system reset is indicated with 0b0100
> + * (PPC_BIT(43)).
> + */
> + if (!(env->spr[SPR_SRR1] & PPC_BIT(43))) {
> + warn_report("ppc_cpu_do_system_reset does not set system reset wakeup reason");
> + env->spr[SPR_SRR1] |= PPC_BIT(43);
> + }
> + } else {
> + /*
> + * For non-powersave system resets, SRR1[42:45] are defined to be
> + * implementation-dependent. The POWER9 User Manual specifies that
> + * an external (SCOM driven, which may come from a BMC nmi command or
> + * another CPU requesting a NMI IPI) system reset exception should be
> + * 0b0010 (PPC_BIT(44)).
> + */
> + env->spr[SPR_SRR1] |= PPC_BIT(44);
> + }
> }
>
> static void pnv_nmi(NMIState *n, int cpu_index, Error **errp)
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-05-07 23:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 11:48 [PATCH] ppc/pnv: Fix NMI system reset SRR1 value Nicholas Piggin
2020-05-07 13:51 ` David Gibson [this message]
2020-05-08 8:43 ` Greg Kurz
2020-05-11 1:30 ` David Gibson
2020-05-07 17:14 ` Cédric Le Goater
2020-05-08 3:43 ` Nicholas Piggin
2020-05-08 14:05 ` Cédric Le Goater
2020-05-08 3:43 ` no-reply
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=20200507135154.GA2282@umbus.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=clg@kaod.org \
--cc=npiggin@gmail.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).