From: David Gibson <david@gibson.dropbear.id.au>
To: Nicholas Piggin <npiggin@gmail.com>
Cc: "Alexey Kardashevskiy" <aik@ozlabs.ru>,
"Mahesh Salgaonkar" <mahesh@linux.vnet.ibm.com>,
qemu-devel@nongnu.org, "Greg Kurz" <groug@kaod.org>,
"Cédric Le Goater" <clg@fr.ibm.com>,
"Ganesh Goudar" <ganeshgr@linux.ibm.com>,
qemu-ppc@nongnu.org
Subject: Re: [PATCH 1/5] ppc/spapr: tweak change system reset helper
Date: Thu, 26 Mar 2020 11:04:33 +1100 [thread overview]
Message-ID: <20200326000433.GI36889@umbus.fritz.box> (raw)
In-Reply-To: <20200325144147.221875-2-npiggin@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 3458 bytes --]
On Thu, Mar 26, 2020 at 12:41:43AM +1000, Nicholas Piggin wrote:
> Rather than have the helper take an optional vector address
> override, instead have its caller modify env->nip itself.
> This is more consistent when adding pnv nmi support, and also
> with mce injection added later.
>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Applied to ppc-for-5.1.
> ---
> hw/ppc/spapr.c | 9 ++++++---
> target/ppc/cpu.h | 2 +-
> target/ppc/excp_helper.c | 5 +----
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 9a2bd501aa..785c41d205 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -3385,13 +3385,13 @@ static void spapr_machine_finalizefn(Object *obj)
> void spapr_do_system_reset_on_cpu(CPUState *cs, run_on_cpu_data arg)
> {
> SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> + CPUPPCState *env = &cpu->env;
>
> cpu_synchronize_state(cs);
> /* If FWNMI is inactive, addr will be -1, which will deliver to 0x100 */
> if (spapr->fwnmi_system_reset_addr != -1) {
> uint64_t rtas_addr, addr;
> - PowerPCCPU *cpu = POWERPC_CPU(cs);
> - CPUPPCState *env = &cpu->env;
>
> /* get rtas addr from fdt */
> rtas_addr = spapr_get_rtas_addr();
> @@ -3405,7 +3405,10 @@ void spapr_do_system_reset_on_cpu(CPUState *cs, run_on_cpu_data arg)
> stq_be_phys(&address_space_memory, addr + sizeof(uint64_t), 0);
> env->gpr[3] = addr;
> }
> - ppc_cpu_do_system_reset(cs, spapr->fwnmi_system_reset_addr);
> + ppc_cpu_do_system_reset(cs);
> + if (spapr->fwnmi_system_reset_addr != -1) {
> + env->nip = spapr->fwnmi_system_reset_addr;
> + }
> }
>
> static void spapr_nmi(NMIState *n, int cpu_index, Error **errp)
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index 88d9449555..f4a5304d43 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -1220,7 +1220,7 @@ int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
> int ppc32_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
> int cpuid, void *opaque);
> #ifndef CONFIG_USER_ONLY
> -void ppc_cpu_do_system_reset(CPUState *cs, target_ulong vector);
> +void ppc_cpu_do_system_reset(CPUState *cs);
> void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector);
> extern const VMStateDescription vmstate_ppc_cpu;
> #endif
> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
> index 08bc885ca6..7f2b5899d3 100644
> --- a/target/ppc/excp_helper.c
> +++ b/target/ppc/excp_helper.c
> @@ -961,15 +961,12 @@ static void ppc_hw_interrupt(CPUPPCState *env)
> }
> }
>
> -void ppc_cpu_do_system_reset(CPUState *cs, target_ulong vector)
> +void ppc_cpu_do_system_reset(CPUState *cs)
> {
> PowerPCCPU *cpu = POWERPC_CPU(cs);
> CPUPPCState *env = &cpu->env;
>
> powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_RESET);
> - if (vector != -1) {
> - env->nip = vector;
> - }
> }
>
> void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector)
--
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-03-26 0:39 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 14:41 [PATCH 0/5] ppc: sreset and machine check injection Nicholas Piggin
2020-03-25 14:41 ` [PATCH 1/5] ppc/spapr: tweak change system reset helper Nicholas Piggin
2020-03-25 16:14 ` [EXTERNAL] " Cédric Le Goater
2020-03-26 0:04 ` David Gibson [this message]
2020-03-25 14:41 ` [PATCH 2/5] ppc/pnv: Add support for NMI interface Nicholas Piggin
2020-03-25 16:38 ` Cédric Le Goater
2020-04-03 7:57 ` Nicholas Piggin
2020-04-03 13:12 ` Nicholas Piggin
2020-04-03 15:47 ` Cédric Le Goater
2020-04-04 1:58 ` Nicholas Piggin
2020-03-26 0:15 ` David Gibson
2020-03-31 3:07 ` Alexey Kardashevskiy
2020-03-31 3:14 ` David Gibson
2020-03-25 14:41 ` [PATCH 3/5] nmi: add MCE class for implementing machine check injection commands Nicholas Piggin
2020-03-25 16:46 ` Cédric Le Goater
2020-03-31 0:22 ` David Gibson
2020-04-03 8:04 ` Nicholas Piggin
2020-04-06 6:45 ` David Gibson
2020-03-25 14:41 ` [PATCH 4/5] ppc/spapr: Implement mce injection Nicholas Piggin
2020-03-25 16:38 ` Cédric Le Goater
2020-03-25 14:41 ` [PATCH 5/5] ppc/pnv: " Nicholas Piggin
2020-03-25 16:39 ` [EXTERNAL] " Cédric Le Goater
2020-04-03 8:07 ` Nicholas Piggin
2020-03-25 16:42 ` [PATCH 0/5] ppc: sreset and machine check injection Cédric Le Goater
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=20200326000433.GI36889@umbus.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=aik@ozlabs.ru \
--cc=clg@fr.ibm.com \
--cc=ganeshgr@linux.ibm.com \
--cc=groug@kaod.org \
--cc=mahesh@linux.vnet.ibm.com \
--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).