Re: [PATCH v3 4/5] s390x: Move clear reset
On Mon, 25 Nov 2019 14:49:54 +0100
Janosch Frank wrote:
> On 11/25/19 2:37 PM, Cornelia Huck wrote:
> > On Mon, 25 Nov 2019 04:03:47 -0500
> > Janosch Frank wrote:
> >
> >> Let's also move the clear reset function into the reset handler.
> >>
> >> Signed-off-by: Janosch Frank
> >> ---
> >> target/s390x/cpu-qom.h | 1 +
> >> target/s390x/cpu.c | 58 +-
> >> 2 files changed, 18 insertions(+), 41 deletions(-)
> >>
> >
> >> @@ -453,6 +424,11 @@ static Property s390x_cpu_properties[] = {
> >> DEFINE_PROP_END_OF_LIST()
> >> };
> >>
> >> +static void s390_cpu_reset_clear(CPUState *s)
> >> +{
> >> +return s390_cpu_reset(s, S390_CPU_RESET_CLEAR);
> >> +}
> >> +
> >> static void s390_cpu_class_init(ObjectClass *oc, void *data)
> >> {
> >> S390CPUClass *scc = S390_CPU_CLASS(oc);
> >> @@ -469,7 +445,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void
> >> *data)
> >> scc->load_normal = s390_cpu_load_normal;
> >> #endif
> >> scc->reset = s390_cpu_reset;
> >> -cc->reset = s390_cpu_full_reset;
> >> +cc->reset = s390_cpu_reset_clear;
> >> cc->class_by_name = s390_cpu_class_by_name,
> >> cc->has_work = s390_cpu_has_work;
> >> #ifdef CONFIG_TCG
> >
> > One thing I liked about the previous naming is that it is more obvious
> > that the clear reset is actually the full reset of a cpu. Not sure if
> > keeping that is better than matching the function name to the name of
> > the reset being performed. Opinions?
> >
>
> Are you only worrying for this particular wrapper or in general?
> I'd be happy to rename the wrapper to s390_cpu_reset_full()
Yes, I was thinking about this wrapper only, but don't feel too
strongly.
pgposG0ExOxQl.pgp
Description: OpenPGP digital signature
Re: [PATCH v3 4/5] s390x: Move clear reset
On 11/25/19 2:37 PM, Cornelia Huck wrote:
> On Mon, 25 Nov 2019 04:03:47 -0500
> Janosch Frank wrote:
>
>> Let's also move the clear reset function into the reset handler.
>>
>> Signed-off-by: Janosch Frank
>> ---
>> target/s390x/cpu-qom.h | 1 +
>> target/s390x/cpu.c | 58 +-
>> 2 files changed, 18 insertions(+), 41 deletions(-)
>>
>
>> @@ -453,6 +424,11 @@ static Property s390x_cpu_properties[] = {
>> DEFINE_PROP_END_OF_LIST()
>> };
>>
>> +static void s390_cpu_reset_clear(CPUState *s)
>> +{
>> +return s390_cpu_reset(s, S390_CPU_RESET_CLEAR);
>> +}
>> +
>> static void s390_cpu_class_init(ObjectClass *oc, void *data)
>> {
>> S390CPUClass *scc = S390_CPU_CLASS(oc);
>> @@ -469,7 +445,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void
>> *data)
>> scc->load_normal = s390_cpu_load_normal;
>> #endif
>> scc->reset = s390_cpu_reset;
>> -cc->reset = s390_cpu_full_reset;
>> +cc->reset = s390_cpu_reset_clear;
>> cc->class_by_name = s390_cpu_class_by_name,
>> cc->has_work = s390_cpu_has_work;
>> #ifdef CONFIG_TCG
>
> One thing I liked about the previous naming is that it is more obvious
> that the clear reset is actually the full reset of a cpu. Not sure if
> keeping that is better than matching the function name to the name of
> the reset being performed. Opinions?
>
Are you only worrying for this particular wrapper or in general?
I'd be happy to rename the wrapper to s390_cpu_reset_full()
signature.asc
Description: OpenPGP digital signature
Re: [PATCH v3 4/5] s390x: Move clear reset
On Mon, 25 Nov 2019 04:03:47 -0500
Janosch Frank wrote:
> Let's also move the clear reset function into the reset handler.
>
> Signed-off-by: Janosch Frank
> ---
> target/s390x/cpu-qom.h | 1 +
> target/s390x/cpu.c | 58 +-
> 2 files changed, 18 insertions(+), 41 deletions(-)
>
> @@ -453,6 +424,11 @@ static Property s390x_cpu_properties[] = {
> DEFINE_PROP_END_OF_LIST()
> };
>
> +static void s390_cpu_reset_clear(CPUState *s)
> +{
> +return s390_cpu_reset(s, S390_CPU_RESET_CLEAR);
> +}
> +
> static void s390_cpu_class_init(ObjectClass *oc, void *data)
> {
> S390CPUClass *scc = S390_CPU_CLASS(oc);
> @@ -469,7 +445,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void
> *data)
> scc->load_normal = s390_cpu_load_normal;
> #endif
> scc->reset = s390_cpu_reset;
> -cc->reset = s390_cpu_full_reset;
> +cc->reset = s390_cpu_reset_clear;
> cc->class_by_name = s390_cpu_class_by_name,
> cc->has_work = s390_cpu_has_work;
> #ifdef CONFIG_TCG
One thing I liked about the previous naming is that it is more obvious
that the clear reset is actually the full reset of a cpu. Not sure if
keeping that is better than matching the function name to the name of
the reset being performed. Opinions?
[PATCH v3 4/5] s390x: Move clear reset
Let's also move the clear reset function into the reset handler.
Signed-off-by: Janosch Frank
---
target/s390x/cpu-qom.h | 1 +
target/s390x/cpu.c | 58 +-
2 files changed, 18 insertions(+), 41 deletions(-)
diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h
index 6f0a12042e..dbe5346ec9 100644
--- a/target/s390x/cpu-qom.h
+++ b/target/s390x/cpu-qom.h
@@ -37,6 +37,7 @@ typedef struct S390CPUDef S390CPUDef;
typedef enum cpu_reset_type {
S390_CPU_RESET_NORMAL,
S390_CPU_RESET_INITIAL,
+S390_CPU_RESET_CLEAR,
} cpu_reset_type;
/**
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 9f009b226c..4853cef204 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -94,6 +94,9 @@ 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_CLEAR:
+memset(env, 0, offsetof(CPUS390XState, start_initial_reset_fields));
+/* fall through */
case S390_CPU_RESET_INITIAL:
/* initial reset does not clear everything! */
memset(>start_initial_reset_fields, 0,
@@ -107,6 +110,14 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type
type)
env->cregs[0] = CR0_RESET;
env->cregs[14] = CR14_RESET;
+#if defined(CONFIG_USER_ONLY)
+/* user mode should always be allowed to use the full FPU */
+env->cregs[0] |= CR0_AFP;
+if (s390_has_feat(S390_FEAT_VECTOR)) {
+env->cregs[0] |= CR0_VECTOR;
+}
+#endif
+
/* tininess for underflow is detected before rounding */
set_float_detect_tininess(float_tininess_before_rounding,
>fpu_status);
@@ -122,46 +133,6 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type
type)
}
}
-/* CPUClass:reset() */
-static void s390_cpu_full_reset(CPUState *s)
-{
-S390CPU *cpu = S390_CPU(s);
-S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
-CPUS390XState *env = >env;
-
-scc->parent_reset(s);
-cpu->env.sigp_order = 0;
-s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
-
-memset(env, 0, offsetof(CPUS390XState, end_reset_fields));
-
-/* architectured initial values for CR 0 and 14 */
-env->cregs[0] = CR0_RESET;
-env->cregs[14] = CR14_RESET;
-
-#if defined(CONFIG_USER_ONLY)
-/* user mode should always be allowed to use the full FPU */
-env->cregs[0] |= CR0_AFP;
-if (s390_has_feat(S390_FEAT_VECTOR)) {
-env->cregs[0] |= CR0_VECTOR;
-}
-#endif
-
-/* 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,
- >fpu_status);
-
-/* Reset state inside the kernel that we cannot access yet from QEMU. */
-if (kvm_enabled()) {
-kvm_s390_reset_vcpu(cpu);
-}
-}
-
#if !defined(CONFIG_USER_ONLY)
static void s390_cpu_machine_reset_cb(void *opaque)
{
@@ -453,6 +424,11 @@ static Property s390x_cpu_properties[] = {
DEFINE_PROP_END_OF_LIST()
};
+static void s390_cpu_reset_clear(CPUState *s)
+{
+return s390_cpu_reset(s, S390_CPU_RESET_CLEAR);
+}
+
static void s390_cpu_class_init(ObjectClass *oc, void *data)
{
S390CPUClass *scc = S390_CPU_CLASS(oc);
@@ -469,7 +445,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
scc->load_normal = s390_cpu_load_normal;
#endif
scc->reset = s390_cpu_reset;
-cc->reset = s390_cpu_full_reset;
+cc->reset = s390_cpu_reset_clear;
cc->class_by_name = s390_cpu_class_by_name,
cc->has_work = s390_cpu_has_work;
#ifdef CONFIG_TCG
--
2.20.1
