[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/14] spapr: Add support for new NMI interface
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 05/14] spapr: Add support for new NMI interface |
Date: |
Thu, 28 Aug 2014 16:09:04 +0200 |
From: Alexey Kardashevskiy <address@hidden>
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 <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 d01978f..5cb452f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -55,6 +55,7 @@
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "trace.h"
+#include "hw/nmi.h"
#include <libfdt.h>
@@ -1576,10 +1577,28 @@ static void spapr_machine_initfn(Object *obj)
spapr_get_kvm_type, spapr_set_kvm_type, 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)";
@@ -1593,6 +1612,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 = {
@@ -1603,6 +1623,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 0fee36f..a379f79 100644
--- a/target-ppc/cpu-qom.h
+++ b/target-ppc/cpu-qom.h
@@ -127,6 +127,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;
typedef struct PPCTimebase {
diff --git a/target-ppc/excp_helper.c b/target-ppc/excp_helper.c
index be71590..922e86d 100644
--- a/target-ppc/excp_helper.c
+++ b/target-ppc/excp_helper.c
@@ -810,6 +810,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)
--
1.8.3.1
- [Qemu-devel] [PULL 00/14] KVM changes for 2014-08-28, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 02/14] cpus: Define callback for QEMU "nmi" command, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 03/14] s390x: Convert QEMUMachine to MachineClass, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 04/14] s390x: Migrate to new NMI interface, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 01/14] kvm: run cpu state synchronization on target vcpu thread, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 05/14] spapr: Add support for new NMI interface,
Paolo Bonzini <=
- [Qemu-devel] [PULL 06/14] target-i386: Don't forbid NX bit on PAE PDEs and PTEs, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 07/14] x86: Use common variable range MTRR counts, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 09/14] x86: Clear MTRRs on vCPU reset, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 08/14] x86: kvm: Add MTRR support for kvm_get|put_msrs(), Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 11/14] vl: process -object after other backend options, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 10/14] checkpatch.pl: adjust typedef definition to QEMU coding style, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 12/14] target-i386: Add "mpx" CPU feature name, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 13/14] target-i386: Add "tsc_adjust" CPU feature name, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 14/14] mc146818rtc: reinitialize irq_reinject_on_ack_count on reset, Paolo Bonzini, 2014/08/28
- Re: [Qemu-devel] [PULL 00/14] KVM changes for 2014-08-28, Peter Maydell, 2014/08/28