From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Thomas Huth <thuth@redhat.com>,
Janosch Frank <frankja@linux.ibm.com>,
David Hildenbrand <david@redhat.com>,
Cornelia Huck <cohuck@redhat.com>,
qemu-devel@nongnu.org, qemu-s390x@nongnu.org
Subject: [PULL v2 05/16] s390x: Move initial reset
Date: Sat, 14 Dec 2019 10:45:15 +0100 [thread overview]
Message-ID: <20191214094526.8698-6-cohuck@redhat.com> (raw)
In-Reply-To: <20191214094526.8698-1-cohuck@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>
---
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 f3b71bac67c9..6f0a12042ed4 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 67d6fbfa4401..ca62fe768569 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 18123dfd5bd1..d2af13b345cc 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 850139b9cd54..727875bb4ab9 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.21.0
next prev parent reply other threads:[~2019-12-14 9:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-14 9:45 [PULL v2 00/16] first s390x update for 5.0 Cornelia Huck
2019-12-14 9:45 ` [PULL v2 01/16] vfio-ccw: Fix error message Cornelia Huck
2019-12-14 9:45 ` [PULL v2 02/16] hw: add compat machines for 5.0 Cornelia Huck
2019-12-14 9:45 ` [PULL v2 03/16] s390x: Don't do a normal reset on the initial cpu Cornelia Huck
2019-12-14 9:45 ` [PULL v2 04/16] s390x: Move reset normal to shared reset handler Cornelia Huck
2019-12-14 9:45 ` Cornelia Huck [this message]
2019-12-14 9:45 ` [PULL v2 06/16] s390x: Move clear reset Cornelia Huck
2019-12-14 9:45 ` [PULL v2 07/16] s390x: Beautify diag308 handling Cornelia Huck
2019-12-14 9:45 ` [PULL v2 08/16] s390x: kvm: Make kvm_sclp_service_call void Cornelia Huck
2019-12-14 9:45 ` [PULL v2 09/16] s390x: Fix cpu normal reset ri clearing Cornelia Huck
2019-12-14 9:45 ` [PULL v2 10/16] s390x/event-facility: Fix realize() error API violations Cornelia Huck
2019-12-14 9:45 ` [PULL v2 11/16] s390x/cpumodel: Fix feature property " Cornelia Huck
2019-12-14 9:45 ` [PULL v2 12/16] s390x/cpumodel: Fix realize() " Cornelia Huck
2019-12-14 9:45 ` [PULL v2 13/16] s390x/cpumodel: Fix query-cpu-model-FOO " Cornelia Huck
2019-12-14 9:45 ` [PULL v2 14/16] s390x/cpumodel: Fix query-cpu-definitions " Cornelia Huck
2019-12-14 9:45 ` [PULL v2 15/16] s390x/tcg: clear local interrupts on reset normal Cornelia Huck
2019-12-14 9:45 ` [PULL v2 16/16] qga: fence guest-set-time if hwclock not available Cornelia Huck
2020-01-03 12:05 ` Peter Maydell
2019-12-16 13:04 ` [PULL v2 00/16] first s390x update for 5.0 Peter Maydell
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=20191214094526.8698-6-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
/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).