From patchwork Tue Nov 27 08:33:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 202119 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7BFB02C0086 for ; Tue, 27 Nov 2012 19:34:27 +1100 (EST) Received: from localhost ([::1]:39198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdGcb-000626-IT for incoming@patchwork.ozlabs.org; Tue, 27 Nov 2012 03:34:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdGcO-000614-4O for qemu-devel@nongnu.org; Tue, 27 Nov 2012 03:34:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TdGcI-0006D5-4x for qemu-devel@nongnu.org; Tue, 27 Nov 2012 03:34:12 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:48070) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdGcH-0006Ci-TK for qemu-devel@nongnu.org; Tue, 27 Nov 2012 03:34:06 -0500 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 27 Nov 2012 08:34:00 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 27 Nov 2012 08:33:58 -0000 Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps4075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qAR8Xo9e61210844 for ; Tue, 27 Nov 2012 08:33:50 GMT Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qAR8XvAP025460 for ; Tue, 27 Nov 2012 01:33:57 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qAR8Xulq025449; Tue, 27 Nov 2012 01:33:57 -0700 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 1122) id DDEB21224437; Tue, 27 Nov 2012 09:33:56 +0100 (CET) From: Jens Freimann To: Alexander Graf Date: Tue, 27 Nov 2012 09:33:53 +0100 Message-Id: <1354005233-60955-1-git-send-email-jfrei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.12.4 x-cbid: 12112708-4966-0000-0000-00000436A388 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.106 Cc: Heinz Graalfs , qemu-devel , Christian Borntraeger , Jens Freimann , Cornelia Huck , Einar Lueck Subject: [Qemu-devel] [PATCH v2] s390: clear registers, psw and prefix at vcpu reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When resetting vcpus on s390/kvm we have to clear registers, psw and prefix as described in the z/Architecture PoP, otherwise a reboot won't work. IPL PSW and prefix are set later on by the s390-ipl device reset code. Signed-off-by: Jens Freimann --- changes v1->v2: - moved cpu reset code from kvm.c to cpu.c - only kvm initial_reset ioctl remains in kvm.c - registered reset handler for s390 cpu reset, like x86 does it target-s390x/cpu.c | 29 +++++++++++++++++++++++++++-- target-s390x/kvm.c | 9 ++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 619b202..f74d6f6 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -24,10 +24,21 @@ #include "qemu-common.h" #include "qemu-timer.h" +#ifndef CONFIG_USER_ONLY +#include "hw/s390x/sclp.h" + +/* TODO: remove me, when reset over QOM tree is implemented */ +static void s390_cpu_machine_reset_cb(void *opaque) +{ + S390CPU *cpu = opaque; + cpu_reset(CPU(cpu)); +} +#endif /* CPUClass::reset() */ static void s390_cpu_reset(CPUState *s) { + int i; S390CPU *cpu = S390_CPU(s); S390CPUClass *scc = S390_CPU_GET_CLASS(cpu); CPUS390XState *env = &cpu->env; @@ -40,9 +51,22 @@ static void s390_cpu_reset(CPUState *s) scc->parent_reset(s); memset(env, 0, offsetof(CPUS390XState, breakpoints)); - /* FIXME: reset vector? */ + + env->halted = 1; + env->exception_index = EXCP_HLT; + for (i = 0; i < 16; i++) { + env->regs[i] = 0; + env->aregs[i] = 0; + env->cregs[i] = 0; + env->fregs[i].ll = 0; + } + /* architectured initial values for CR 0 and 14 */ + env->cregs[0] = 0xE0UL; + env->cregs[14] = 0xC2000000UL; + env->psw.mask = 0; + env->psw.addr = 0; + env->psa = 0; tlb_flush(env, 1); - s390_add_running_cpu(env); } static void s390_cpu_initfn(Object *obj) @@ -56,6 +80,7 @@ static void s390_cpu_initfn(Object *obj) cpu_exec_init(env); #if !defined(CONFIG_USER_ONLY) + qemu_register_reset(s390_cpu_machine_reset_cb, cpu); qemu_get_timedate(&tm, 0); env->tod_offset = TOD_UNIX_EPOCH + (time2tod(mktimegm(&tm)) * 1000000000ULL); diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 94de764..d26555f 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -85,7 +85,14 @@ int kvm_arch_init_vcpu(CPUS390XState *env) void kvm_arch_reset_vcpu(CPUS390XState *env) { - /* FIXME: add code to reset vcpu. */ + /* The initial reset call is needed here to reset in-kernel + * vcpu data that we can't access directly from QEMU + * (i.e. with older kernels which don't support sync_regs/ONE_REG). + * Before this ioctl cpu_synchronize_state() is called in common kvm + * code (kvm-all) */ + if (kvm_vcpu_ioctl(env, KVM_S390_INITIAL_RESET, NULL)) { + perror("Can't reset vcpu\n"); + } } int kvm_arch_put_registers(CPUS390XState *env, int level)