From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Alexander Graf <agraf@suse.de>
Cc: "Cornelia Huck" <cornelia.huck@de.ibm.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
"Andreas Färber" <afaerber@suse.de>,
qemu-devel <qemu-devel@nongnu.org>
Subject: [Qemu-devel] [PATCH 5/6] s390: Implement load normal reset
Date: Mon, 29 Jul 2013 16:19:26 +0200 [thread overview]
Message-ID: <1375107567-24301-6-git-send-email-borntraeger@de.ibm.com> (raw)
In-Reply-To: <1375107567-24301-1-git-send-email-borntraeger@de.ibm.com>
kdump on s390 uses a load normal reset to bring the system in a defined
state by doing a subsystem reset. The issuing CPUs will have an initial
CPU reset, all other CPUs will have a CPU reset as defined in POP (no
register content will change).
Implement this as architectured.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
target-s390x/kvm.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index ec1d1a5..532326f 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -33,6 +33,7 @@
#include "sysemu/sysemu.h"
#include "sysemu/kvm.h"
#include "cpu.h"
+#include "sysemu/cpus.h"
#include "sysemu/device_tree.h"
#include "qapi/qmp/qjson.h"
#include "monitor/monitor.h"
@@ -581,6 +582,32 @@ static int handle_hypercall(S390CPU *cpu, struct kvm_run *run)
return 0;
}
+static void cpu_reset_all(void)
+{
+ CPUState *cpu;
+ S390CPUClass *scc;
+
+ for (cpu = first_cpu; cpu; cpu = cpu->next_cpu) {
+ scc = S390_CPU_GET_CLASS(CPU(cpu));
+ scc->cpu_reset(CPU(cpu));
+ }
+}
+
+static int load_normal_reset(S390CPU *cpu)
+{
+ S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
+
+ pause_all_vcpus();
+ cpu_synchronize_all_states();
+ cpu_reset_all();
+ io_subsystem_reset();
+ scc->initial_cpu_reset(CPU(cpu));
+ scc->load_normal(CPU(cpu));
+ cpu_synchronize_all_post_reset();
+ resume_all_vcpus();
+ return 0;
+}
+
static int handle_diag308(S390CPU *cpu, struct kvm_run *run)
{
uint64_t r1, r3, addr, subcode;
@@ -603,6 +630,8 @@ static int handle_diag308(S390CPU *cpu, struct kvm_run *run)
}
switch (subcode) {
+ case 1:
+ return load_normal_reset(cpu);
case 5:
if ((r1 & 1) || (addr & 0x0fffULL)) {
enter_pgmcheck(cpu, PGM_SPECIFICATION);
--
1.8.3.1
next prev parent reply other threads:[~2013-07-29 14:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-29 14:19 [Qemu-devel] [PATCH/RFC 0/6] s390 kdump /soft reset and friends Christian Borntraeger
2013-07-29 14:19 ` [Qemu-devel] [PATCH 1/6] s390/kvm: basic implementation of diagnose 308 subcode 6 Christian Borntraeger
2013-07-29 14:19 ` [Qemu-devel] [PATCH 2/6] s390: provide I/O subsystem reset Christian Borntraeger
2013-07-29 14:19 ` [Qemu-devel] [PATCH 3/6] s390: provide a cpu load normal function Christian Borntraeger
2013-07-29 14:19 ` [Qemu-devel] [PATCH 4/6] s390/cpu: split CPU reset into architectured functions Christian Borntraeger
2013-07-29 14:19 ` Christian Borntraeger [this message]
2013-07-29 14:19 ` [Qemu-devel] [PATCH 6/6] s390: wire up nmi command to raise a RESTART interrupt on S390 Christian Borntraeger
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=1375107567-24301-6-git-send-email-borntraeger@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=afaerber@suse.de \
--cc=agraf@suse.de \
--cc=cornelia.huck@de.ibm.com \
--cc=qemu-devel@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).