From: David Gibson <david@gibson.dropbear.id.au>
To: Alexey Kardashevskiy <aik@ozlabs.ru>
Cc: "Mahesh Salgaonkar" <mahesh@linux.vnet.ibm.com>,
qemu-devel@nongnu.org, "Nicholas Piggin" <npiggin@gmail.com>,
"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 2/5] ppc/pnv: Add support for NMI interface
Date: Tue, 31 Mar 2020 14:14:07 +1100 [thread overview]
Message-ID: <20200331031407.GH47772@umbus.fritz.box> (raw)
In-Reply-To: <0c4b70bf-2841-5693-1e1b-e9a0ad168232@ozlabs.ru>
[-- Attachment #1: Type: text/plain, Size: 3458 bytes --]
On Tue, Mar 31, 2020 at 02:07:42PM +1100, Alexey Kardashevskiy wrote:
>
>
> On 26/03/2020 01:41, Nicholas Piggin wrote:
> > This implements the NMI interface for the PNV machine, similarly to
> > commit 3431648272d ("spapr: Add support for new NMI interface") for
> > SPAPR.
> >
> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> > ---
> > hw/ppc/pnv.c | 30 +++++++++++++++++++++++++++++-
> > 1 file changed, 29 insertions(+), 1 deletion(-)
> >
> > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> > index b75ad06390..671535ebe6 100644
> > --- a/hw/ppc/pnv.c
> > +++ b/hw/ppc/pnv.c
> > @@ -27,6 +27,7 @@
> > #include "sysemu/runstate.h"
> > #include "sysemu/cpus.h"
> > #include "sysemu/device_tree.h"
> > +#include "sysemu/hw_accel.h"
> > #include "target/ppc/cpu.h"
> > #include "qemu/log.h"
> > #include "hw/ppc/fdt.h"
> > @@ -34,6 +35,7 @@
> > #include "hw/ppc/pnv.h"
> > #include "hw/ppc/pnv_core.h"
> > #include "hw/loader.h"
> > +#include "hw/nmi.h"
> > #include "exec/address-spaces.h"
> > #include "qapi/visitor.h"
> > #include "monitor/monitor.h"
> > @@ -1955,10 +1957,35 @@ static void pnv_machine_set_hb(Object *obj, bool value, Error **errp)
> > }
> > }
> >
> > +static void pnv_cpu_do_nmi_on_cpu(CPUState *cs, run_on_cpu_data arg)
> > +{
> > + PowerPCCPU *cpu = POWERPC_CPU(cs);
> > + CPUPPCState *env = &cpu->env;
> > +
> > + 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);
> > +}
> > +
> > +static void pnv_nmi(NMIState *n, int cpu_index, Error **errp)
> > +{
> > + CPUState *cs;
> > +
> > + CPU_FOREACH(cs) {
> > + async_run_on_cpu(cs, pnv_cpu_do_nmi_on_cpu, RUN_ON_CPU_NULL);
> > + }
> > +}
> > +
> > static void pnv_machine_class_init(ObjectClass *oc, void *data)
> > {
> > MachineClass *mc = MACHINE_CLASS(oc);
> > InterruptStatsProviderClass *ispc = INTERRUPT_STATS_PROVIDER_CLASS(oc);
> > + NMIClass *nc = NMI_CLASS(oc);
> >
> > mc->desc = "IBM PowerNV (Non-Virtualized)";
> > mc->init = pnv_init;
> > @@ -1975,6 +2002,7 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data)
> > mc->default_ram_size = INITRD_LOAD_ADDR + INITRD_MAX_SIZE;
> > mc->default_ram_id = "pnv.ram";
> > ispc->print_info = pnv_pic_print_info;
> > + nc->nmi_monitor_handler = pnv_nmi;
> >
> > object_class_property_add_bool(oc, "hb-mode",
> > pnv_machine_get_hb, pnv_machine_set_hb,
> > @@ -2038,7 +2066,7 @@ static const TypeInfo types[] = {
> > .class_size = sizeof(PnvMachineClass),
> > .interfaces = (InterfaceInfo[]) {
> > { TYPE_INTERRUPT_STATS_PROVIDER },
> > - { },
> > + { TYPE_NMI },
>
>
> The interface list must end with {}, otherwise QEMU crashes very early.
> Thanks,
I've fixed that inline now.
>
>
> > },
> > },
> > {
> >
>
--
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-31 3:24 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
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 [this message]
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=20200331031407.GH47772@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).