From 0d1c0adf25a323be0663863ebe44a6aefb5f7baf Mon Sep 17 00:00:00 2001

From: Thomas Huth <thuth@redhat.com>

Date: Fri, 29 May 2020 05:53:47 -0400

Subject: [PATCH 05/42] s390x: Move initial reset

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Thomas Huth <thuth@redhat.com>

Message-id: <20200529055420.16855-6-thuth@redhat.com>

Patchwork-id: 97024

O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 05/38] s390x: Move initial reset

Bugzilla: 1828317

RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

RH-Acked-by: David Hildenbrand <david@redhat.com>

From: Janosch Frank <frankja@linux.ibm.com>

Let's move the intial reset into the reset handler and cleanup

afterwards.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>

Reviewed-by: David Hildenbrand <david@redhat.com>

Message-Id: <20191128083723.11937-1-frankja@linux.ibm.com>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit 81b9222358e5c8f666f0d86057c75e40531d804c)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 target/s390x/cpu-qom.h |  2 +-

 target/s390x/cpu.c     | 46 +++++++++++++++++-------------------------

 target/s390x/cpu.h     |  2 +-

 target/s390x/sigp.c    |  2 +-

 4 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h

index f3b71bac67..6f0a12042e 100644

--- a/target/s390x/cpu-qom.h

+++ b/target/s390x/cpu-qom.h

@@ -36,6 +36,7 @@ typedef struct S390CPUDef S390CPUDef;

 typedef enum cpu_reset_type {

     S390_CPU_RESET_NORMAL,

+    S390_CPU_RESET_INITIAL,

 } cpu_reset_type;

 /**

@@ -62,7 +63,6 @@ typedef struct S390CPUClass {

     void (*parent_reset)(CPUState *cpu);

     void (*load_normal)(CPUState *cpu);

     void (*reset)(CPUState *cpu, cpu_reset_type type);

-    void (*initial_cpu_reset)(CPUState *cpu);

 } S390CPUClass;

 typedef struct S390CPU S390CPU;

diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c

index 67d6fbfa44..ca62fe7685 100644

--- a/target/s390x/cpu.c

+++ b/target/s390x/cpu.c

@@ -94,6 +94,23 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)

     s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);

     switch (type) {

+    case S390_CPU_RESET_INITIAL:

+        /* initial reset does not clear everything! */

+        memset(&env->start_initial_reset_fields, 0,

+               offsetof(CPUS390XState, end_reset_fields) -

+               offsetof(CPUS390XState, start_initial_reset_fields));

+

+        /* architectured initial value for Breaking-Event-Address register */

+        env->gbea = 1;

+

+        /* architectured initial values for CR 0 and 14 */

+        env->cregs[0] = CR0_RESET;

+        env->cregs[14] = CR14_RESET;

+

+        /* tininess for underflow is detected before rounding */

+        set_float_detect_tininess(float_tininess_before_rounding,

+                                  &env->fpu_status);

+       /* fall through */

     case S390_CPU_RESET_NORMAL:

         env->pfault_token = -1UL;

         env->bpbc = false;

@@ -101,35 +118,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)

     default:

         g_assert_not_reached();

     }

-}

-

-/* S390CPUClass::initial_reset() */

-static void s390_cpu_initial_reset(CPUState *s)

-{

-    S390CPU *cpu = S390_CPU(s);

-    CPUS390XState *env = &cpu->env;

-

-    s390_cpu_reset(s, S390_CPU_RESET_NORMAL);

-    /* initial reset does not clear everything! */

-    memset(&env->start_initial_reset_fields, 0,

-        offsetof(CPUS390XState, end_reset_fields) -

-        offsetof(CPUS390XState, start_initial_reset_fields));

-

-    /* architectured initial values for CR 0 and 14 */

-    env->cregs[0] = CR0_RESET;

-    env->cregs[14] = CR14_RESET;

-

-    /* architectured initial value for Breaking-Event-Address register */

-    env->gbea = 1;

-

-    env->pfault_token = -1UL;

-

-    /* tininess for underflow is detected before rounding */

-    set_float_detect_tininess(float_tininess_before_rounding,

-                              &env->fpu_status);

     /* Reset state inside the kernel that we cannot access yet from QEMU. */

-    if (kvm_enabled()) {

+    if (kvm_enabled() && type != S390_CPU_RESET_NORMAL) {

         kvm_s390_reset_vcpu(cpu);

     }

 }

@@ -481,7 +472,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)

     scc->load_normal = s390_cpu_load_normal;

 #endif

     scc->reset = s390_cpu_reset;

-    scc->initial_cpu_reset = s390_cpu_initial_reset;

     cc->reset = s390_cpu_full_reset;

     cc->class_by_name = s390_cpu_class_by_name,

     cc->has_work = s390_cpu_has_work;

diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h

index 18123dfd5b..d2af13b345 100644

--- a/target/s390x/cpu.h

+++ b/target/s390x/cpu.h

@@ -748,7 +748,7 @@ static inline void s390_do_cpu_initial_reset(CPUState *cs, run_on_cpu_data arg)

 {

     S390CPUClass *scc = S390_CPU_GET_CLASS(cs);

-    scc->initial_cpu_reset(cs);

+    scc->reset(cs, S390_CPU_RESET_INITIAL);

 }

 static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg)

diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c

index 850139b9cd..727875bb4a 100644

--- a/target/s390x/sigp.c

+++ b/target/s390x/sigp.c

@@ -254,7 +254,7 @@ static void sigp_initial_cpu_reset(CPUState *cs, run_on_cpu_data arg)

     SigpInfo *si = arg.host_ptr;

     cpu_synchronize_state(cs);

-    scc->initial_cpu_reset(cs);

+    scc->reset(cs, S390_CPU_RESET_INITIAL);

     cpu_synchronize_post_reset(cs);

     si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;

 }

-- 

2.27.0