openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390x: Move initial reset 

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>
This commit is contained in:
Janosch Frank 2019-11-28 03:37:23 -05:00 committed by Cornelia Huck
parent eac4f82791
commit 81b9222358
4 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/s390x/cpu-qom.h
View File

@ -36,6 +36,7 @@ typedef struct S390CPUDef S390CPUDef;
typedef enum cpu_reset_type { typedef enum cpu_reset_type {
S390_CPU_RESET_NORMAL, S390_CPU_RESET_NORMAL,
S390_CPU_RESET_INITIAL,
} cpu_reset_type; } cpu_reset_type;
/** /**
@ -62,7 +63,6 @@ typedef struct S390CPUClass {
void (*parent_reset)(CPUState *cpu); void (*parent_reset)(CPUState *cpu);
void (*load_normal)(CPUState *cpu); void (*load_normal)(CPUState *cpu);
void (*reset)(CPUState *cpu, cpu_reset_type type); void (*reset)(CPUState *cpu, cpu_reset_type type);
void (*initial_cpu_reset)(CPUState *cpu);
} S390CPUClass; } S390CPUClass;
typedef struct S390CPU S390CPU; typedef struct S390CPU S390CPU;

46
target/s390x/cpu.c
View File

@ -94,6 +94,23 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu); s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
switch (type) { 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: case S390_CPU_RESET_NORMAL:
env->pfault_token = -1UL; env->pfault_token = -1UL;
env->bpbc = false; env->bpbc = false;
@ -101,35 +118,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
default: default:
g_assert_not_reached(); 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. */ /* 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); 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; scc->load_normal = s390_cpu_load_normal;
#endif #endif
scc->reset = s390_cpu_reset; scc->reset = s390_cpu_reset;
scc->initial_cpu_reset = s390_cpu_initial_reset;
cc->reset = s390_cpu_full_reset; cc->reset = s390_cpu_full_reset;
cc->class_by_name = s390_cpu_class_by_name, cc->class_by_name = s390_cpu_class_by_name,
cc->has_work = s390_cpu_has_work; cc->has_work = s390_cpu_has_work;

2
target/s390x/cpu.h
View File

@ -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); 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) static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg)

2
target/s390x/sigp.c
View File

@ -254,7 +254,7 @@ static void sigp_initial_cpu_reset(CPUState *cs, run_on_cpu_data arg)
SigpInfo *si = arg.host_ptr; SigpInfo *si = arg.host_ptr;
cpu_synchronize_state(cs); cpu_synchronize_state(cs);
scc->initial_cpu_reset(cs); scc->reset(cs, S390_CPU_RESET_INITIAL);
cpu_synchronize_post_reset(cs); cpu_synchronize_post_reset(cs);
si->cc = SIGP_CC_ORDER_CODE_ACCEPTED; si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
} }