[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] s390: Add CPU reset handler
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 5/6] s390: Add CPU reset handler |
Date: |
Mon, 7 Jan 2013 17:09:25 +0100 |
From: Jens Freimann <address@hidden>
Add a CPU reset handler to have all CPUs in a PoP compliant
state.
Signed-off-by: Jens Freimann <address@hidden>
[agraf: move hw/hw.h into existing ifdef]
Signed-off-by: Alexander Graf <address@hidden>
---
target-s390x/cpu.c | 35 +++++++++++++++++++++++++++++++++--
target-s390x/kvm.c | 9 ++++++++-
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index 4833b3e..fcd195c 100644
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -4,6 +4,7 @@
* Copyright (c) 2009 Ulrich Hecht
* Copyright (c) 2011 Alexander Graf
* Copyright (c) 2012 SUSE LINUX Products GmbH
+ * Copyright (c) 2012 IBM Corp.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,15 +19,21 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see
* <http://www.gnu.org/licenses/lgpl-2.1.html>
+ * Contributions after 2012-12-11 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "cpu.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#ifndef CONFIG_USER_ONLY
+#include "hw/hw.h"
#include "sysemu/arch_init.h"
#endif
+#define CR0_RESET 0xE0UL
+#define CR14_RESET 0xC2000000UL;
+
/* generate CPU information for cpu -? */
void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf)
{
@@ -63,14 +70,33 @@ static void s390_cpu_reset(CPUState *s)
log_cpu_state(env, 0);
}
+ s390_del_running_cpu(env);
+
scc->parent_reset(s);
memset(env, 0, offsetof(CPUS390XState, breakpoints));
- /* FIXME: reset vector? */
+
+ /* architectured initial values for CR 0 and 14 */
+ env->cregs[0] = CR0_RESET;
+ env->cregs[14] = CR14_RESET;
+ /* set halted to 1 to make sure we can add the cpu in
+ * s390_ipl_cpu code, where env->halted is set back to 0
+ * after incrementing the cpu counter */
+#if !defined(CONFIG_USER_ONLY)
+ env->halted = 1;
+#endif
tlb_flush(env, 1);
- s390_add_running_cpu(env);
}
+#if !defined(CONFIG_USER_ONLY)
+static void s390_cpu_machine_reset_cb(void *opaque)
+{
+ S390CPU *cpu = opaque;
+
+ cpu_reset(CPU(cpu));
+}
+#endif
+
static void s390_cpu_initfn(Object *obj)
{
S390CPU *cpu = S390_CPU(obj);
@@ -82,12 +108,17 @@ 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);
env->tod_basetime = 0;
env->tod_timer = qemu_new_timer_ns(vm_clock, s390x_tod_timer, cpu);
env->cpu_timer = qemu_new_timer_ns(vm_clock, s390x_cpu_timer, cpu);
+ /* set env->halted state to 1 to avoid decrementing the running
+ * cpu counter in s390_cpu_reset to a negative number at
+ * initial ipl */
+ env->halted = 1;
#endif
env->cpu_num = cpu_num++;
env->ext_index = -1;
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 5785f7d..8bd3080 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -89,7 +89,14 @@ int kvm_arch_init_vcpu(CPUState *cpu)
void kvm_arch_reset_vcpu(CPUState *cpu)
{
- /* 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(cpu, KVM_S390_INITIAL_RESET, NULL)) {
+ perror("Can't reset vcpu\n");
+ }
}
int kvm_arch_put_registers(CPUState *cs, int level)
--
1.6.0.2
- [Qemu-devel] [PULL 0/6] s390 patch queue 2013-01-07, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 4/6] s390x: Remove inline function ebcdic_put and related data from cpu.h, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 6/6] s390x: fix indentation, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 1/6] s390: new contributions GPLv2 or later, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 2/6] s390: Move IPL code into a separate device, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 5/6] s390: Add CPU reset handler,
Alexander Graf <=
- [Qemu-devel] [PATCH 3/6] S390: Enable -cpu help and QMP query-cpu-definitions, Alexander Graf, 2013/01/07
- Re: [Qemu-devel] [PULL 0/6] s390 patch queue 2013-01-07, Anthony Liguori, 2013/01/08
- Re: [Qemu-devel] [PULL 0/6] s390 patch queue 2013-01-07, Rob Landley, 2013/01/09