qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Alexey Kardashevskiy <aik@ozlabs.ru>,
	Alexander Graf <agraf@suse.de>,
	Luiz Capitulino <lcapitulino@redhat.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	qemu-ppc@nongnu.org, Cornelia Huck <cornelia.huck@de.ibm.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Richard Henderson <rth@twiddle.net>
Subject: [Qemu-devel] [PATCH v7 4/4] spapr: Add support for new NMI interface
Date: Fri, 13 Jun 2014 13:36:59 +1000	[thread overview]
Message-ID: <1402630619-4408-5-git-send-email-aik@ozlabs.ru> (raw)
In-Reply-To: <1402630619-4408-1-git-send-email-aik@ozlabs.ru>

This implements an NMI interface POWERPC SPAPR machine.
This enables an "nmi" HMP/QMP command supported on SPAPR.

This calls POWERPC_EXCP_RESET (vector 0x100) in the guest to deliver NMI
to every CPU. The expected result is XMON (in-kernel debugger) invocation.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
Changes:
v7:
* s/ppc_cpu_do_nmi/ppc_cpu_do_system_reset/

v6:
* support NMI interface

v4:
* s/\<nmi\>/nmi_monitor_handler/
* added note about XMON into commit log

v3:
* ppc_cpu_do_nmi() is exported from excp_helper.c instead of powerpc_excp()
---
 hw/ppc/spapr.c           | 21 +++++++++++++++++++++
 target-ppc/cpu-qom.h     |  1 +
 target-ppc/excp_helper.c |  8 ++++++++
 3 files changed, 30 insertions(+)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 57e9578..34cbd1e 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -53,6 +53,7 @@
 #include "hw/usb.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
+#include "hw/nmi.h"
 
 #include <libfdt.h>
 
@@ -1476,10 +1477,28 @@ static char *spapr_get_fw_dev_path(FWPathProvider *p, BusState *bus,
     return NULL;
 }
 
+static void ppc_cpu_do_nmi_on_cpu(void *arg)
+{
+    CPUState *cs = arg;
+
+    cpu_synchronize_state(cs);
+    ppc_cpu_do_system_reset(cs);
+}
+
+static void spapr_nmi(NMIState *n, int cpu_index, Error **errp)
+{
+    CPUState *cs;
+
+    CPU_FOREACH(cs) {
+        async_run_on_cpu(cs, ppc_cpu_do_nmi_on_cpu, cs);
+    }
+}
+
 static void spapr_machine_class_init(ObjectClass *oc, void *data)
 {
     MachineClass *mc = MACHINE_CLASS(oc);
     FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc);
+    NMIClass *nc = NMI_CLASS(oc);
 
     mc->name = "pseries";
     mc->desc = "pSeries Logical Partition (PAPR compliant)";
@@ -1493,6 +1512,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
     mc->kvm_type = spapr_kvm_type;
 
     fwc->get_dev_path = spapr_get_fw_dev_path;
+    nc->nmi_monitor_handler = spapr_nmi;
 }
 
 static const TypeInfo spapr_machine_info = {
@@ -1501,6 +1521,7 @@ static const TypeInfo spapr_machine_info = {
     .class_init    = spapr_machine_class_init,
     .interfaces = (InterfaceInfo[]) {
         { TYPE_FW_PATH_PROVIDER },
+        { TYPE_NMI },
         { }
     },
 };
diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h
index 47dc8e6..30f2a03 100644
--- a/target-ppc/cpu-qom.h
+++ b/target-ppc/cpu-qom.h
@@ -119,6 +119,7 @@ int ppc64_cpu_write_elf64_qemunote(WriteCoreDumpFunction f,
 int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
                                int cpuid, void *opaque);
 #ifndef CONFIG_USER_ONLY
+void ppc_cpu_do_system_reset(CPUState *cs);
 extern const struct VMStateDescription vmstate_ppc_cpu;
 #endif
 
diff --git a/target-ppc/excp_helper.c b/target-ppc/excp_helper.c
index 7dfc52d..388392b 100644
--- a/target-ppc/excp_helper.c
+++ b/target-ppc/excp_helper.c
@@ -802,6 +802,14 @@ void ppc_hw_interrupt(CPUPPCState *env)
         }
     }
 }
+
+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);
+}
 #endif /* !CONFIG_USER_ONLY */
 
 #if defined(DEBUG_OP)
-- 
2.0.0

  parent reply	other threads:[~2014-06-13  3:37 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-13  3:36 [Qemu-devel] [PATCH v7 0/4] cpus: Add generic "nmi" monitor command support Alexey Kardashevskiy
2014-06-13  3:36 ` [Qemu-devel] [PATCH v7 1/4] cpus: Define callback for QEMU "nmi" command Alexey Kardashevskiy
2014-07-03  6:41   ` [Qemu-devel] [Qemu-ppc] " Nikunj A Dadhania
2014-07-03 12:36     ` Eric Blake
2014-07-15 14:50   ` [Qemu-devel] " Eric Blake
2014-07-15 15:00     ` Peter Maydell
2014-06-13  3:36 ` [Qemu-devel] [PATCH v7 2/4] s390x: Convert QEMUMachine to MachineClass Alexey Kardashevskiy
2014-06-13  3:44   ` Alexey Kardashevskiy
2014-06-13 12:47     ` Eric Blake
2014-06-13  5:56   ` Cornelia Huck
2014-06-13  3:36 ` [Qemu-devel] [PATCH v7 3/4] s390x: Migrate to new NMI interface Alexey Kardashevskiy
2014-06-13  6:00   ` Cornelia Huck
2014-06-14  2:41     ` Alexey Kardashevskiy
2014-06-16  7:16       ` Cornelia Huck
2014-06-16  8:33         ` Alexey Kardashevskiy
2014-06-16  8:37           ` Alexander Graf
2014-06-23 13:32             ` Alexey Kardashevskiy
2014-07-03  4:59               ` Alexey Kardashevskiy
2014-07-03  7:11                 ` Markus Armbruster
2014-07-14  3:17                   ` Alexey Kardashevskiy
2014-07-14 20:29                     ` Paolo Bonzini
2014-07-15  5:47                       ` Cornelia Huck
2014-07-17  6:30                       ` Alexey Kardashevskiy
2014-08-20 10:20                         ` Alexey Kardashevskiy
2014-08-20 11:20                           ` Alexander Graf
2014-08-20 11:38                             ` Alexey Kardashevskiy
2014-08-20 12:05                               ` Alexander Graf
2014-08-20 12:11                                 ` Alexey Kardashevskiy
2014-08-20 12:12                                   ` Alexander Graf
2014-08-20 13:13                                     ` Paolo Bonzini
2014-06-13  3:36 ` Alexey Kardashevskiy [this message]
2014-06-13 10:50 ` [Qemu-devel] [PATCH v7 0/4] cpus: Add generic "nmi" monitor command support Alexander Graf
2014-06-16  8:57 ` [Qemu-devel] [PATCH v8] s390x: Migrate to new NMI interface Alexey Kardashevskiy
2014-06-16 10:56   ` Cornelia Huck

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=1402630619-4408-5-git-send-email-aik@ozlabs.ru \
    --to=aik@ozlabs.ru \
    --cc=agraf@suse.de \
    --cc=borntraeger@de.ibm.com \
    --cc=cornelia.huck@de.ibm.com \
    --cc=lcapitulino@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=rth@twiddle.net \
    /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).