yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From f268cc7071ecb4322c03f3183acbcf90421da3c7 Mon Sep 17 00:00:00 2001
902636
From: Thomas Huth <thuth@redhat.com>
902636
Date: Fri, 29 May 2020 05:53:48 -0400
902636
Subject: [PATCH 06/42] s390x: Move clear reset
902636
MIME-Version: 1.0
902636
Content-Type: text/plain; charset=UTF-8
902636
Content-Transfer-Encoding: 8bit
902636
902636
RH-Author: Thomas Huth <thuth@redhat.com>
902636
Message-id: <20200529055420.16855-7-thuth@redhat.com>
902636
Patchwork-id: 97019
902636
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 06/38] s390x: Move clear reset
902636
Bugzilla: 1828317
902636
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
902636
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
902636
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
902636
RH-Acked-by: David Hildenbrand <david@redhat.com>
902636
902636
From: Janosch Frank <frankja@linux.ibm.com>
902636
902636
Let's also move the clear reset function into the reset handler.
902636
902636
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
902636
Message-Id: <20191127175046.4911-5-frankja@linux.ibm.com>
902636
Reviewed-by: David Hildenbrand <david@redhat.com>
902636
Reviewed-by: Thomas Huth <thuth@redhat.com>
902636
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
902636
(cherry picked from commit eb8adcc3e9e3b8405c104ede72cf9f3bb2a5e226)
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 target/s390x/cpu-qom.h |  1 +
902636
 target/s390x/cpu.c     | 58 +++++++++++++-----------------------------
902636
 2 files changed, 18 insertions(+), 41 deletions(-)
902636
902636
diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h
902636
index 6f0a12042e..dbe5346ec9 100644
902636
--- a/target/s390x/cpu-qom.h
902636
+++ b/target/s390x/cpu-qom.h
902636
@@ -37,6 +37,7 @@ typedef struct S390CPUDef S390CPUDef;
902636
 typedef enum cpu_reset_type {
902636
     S390_CPU_RESET_NORMAL,
902636
     S390_CPU_RESET_INITIAL,
902636
+    S390_CPU_RESET_CLEAR,
902636
 } cpu_reset_type;
902636
 
902636
 /**
902636
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
902636
index ca62fe7685..bd39cb54b7 100644
902636
--- a/target/s390x/cpu.c
902636
+++ b/target/s390x/cpu.c
902636
@@ -94,6 +94,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
902636
     s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
902636
 
902636
     switch (type) {
902636
+    case S390_CPU_RESET_CLEAR:
902636
+        memset(env, 0, offsetof(CPUS390XState, start_initial_reset_fields));
902636
+        /* fall through */
902636
     case S390_CPU_RESET_INITIAL:
902636
         /* initial reset does not clear everything! */
902636
         memset(&env->start_initial_reset_fields, 0,
902636
@@ -107,6 +110,14 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
902636
         env->cregs[0] = CR0_RESET;
902636
         env->cregs[14] = CR14_RESET;
902636
 
902636
+#if defined(CONFIG_USER_ONLY)
902636
+        /* user mode should always be allowed to use the full FPU */
902636
+        env->cregs[0] |= CR0_AFP;
902636
+        if (s390_has_feat(S390_FEAT_VECTOR)) {
902636
+            env->cregs[0] |= CR0_VECTOR;
902636
+        }
902636
+#endif
902636
+
902636
         /* tininess for underflow is detected before rounding */
902636
         set_float_detect_tininess(float_tininess_before_rounding,
902636
                                   &env->fpu_status);
902636
@@ -125,46 +136,6 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
902636
     }
902636
 }
902636
 
902636
-/* CPUClass:reset() */
902636
-static void s390_cpu_full_reset(CPUState *s)
902636
-{
902636
-    S390CPU *cpu = S390_CPU(s);
902636
-    S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
902636
-    CPUS390XState *env = &cpu->env;
902636
-
902636
-    scc->parent_reset(s);
902636
-    cpu->env.sigp_order = 0;
902636
-    s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
902636
-
902636
-    memset(env, 0, offsetof(CPUS390XState, end_reset_fields));
902636
-
902636
-    /* architectured initial values for CR 0 and 14 */
902636
-    env->cregs[0] = CR0_RESET;
902636
-    env->cregs[14] = CR14_RESET;
902636
-
902636
-#if defined(CONFIG_USER_ONLY)
902636
-    /* user mode should always be allowed to use the full FPU */
902636
-    env->cregs[0] |= CR0_AFP;
902636
-    if (s390_has_feat(S390_FEAT_VECTOR)) {
902636
-        env->cregs[0] |= CR0_VECTOR;
902636
-    }
902636
-#endif
902636
-
902636
-    /* architectured initial value for Breaking-Event-Address register */
902636
-    env->gbea = 1;
902636
-
902636
-    env->pfault_token = -1UL;
902636
-
902636
-    /* tininess for underflow is detected before rounding */
902636
-    set_float_detect_tininess(float_tininess_before_rounding,
902636
-                              &env->fpu_status);
902636
-
902636
-    /* Reset state inside the kernel that we cannot access yet from QEMU. */
902636
-    if (kvm_enabled()) {
902636
-        kvm_s390_reset_vcpu(cpu);
902636
-    }
902636
-}
902636
-
902636
 #if !defined(CONFIG_USER_ONLY)
902636
 static void s390_cpu_machine_reset_cb(void *opaque)
902636
 {
902636
@@ -456,6 +427,11 @@ static Property s390x_cpu_properties[] = {
902636
     DEFINE_PROP_END_OF_LIST()
902636
 };
902636
 
902636
+static void s390_cpu_reset_full(CPUState *s)
902636
+{
902636
+    return s390_cpu_reset(s, S390_CPU_RESET_CLEAR);
902636
+}
902636
+
902636
 static void s390_cpu_class_init(ObjectClass *oc, void *data)
902636
 {
902636
     S390CPUClass *scc = S390_CPU_CLASS(oc);
902636
@@ -472,7 +448,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
902636
     scc->load_normal = s390_cpu_load_normal;
902636
 #endif
902636
     scc->reset = s390_cpu_reset;
902636
-    cc->reset = s390_cpu_full_reset;
902636
+    cc->reset = s390_cpu_reset_full;
902636
     cc->class_by_name = s390_cpu_class_by_name,
902636
     cc->has_work = s390_cpu_has_work;
902636
 #ifdef CONFIG_TCG
902636
-- 
902636
2.27.0
902636