Commit f5ae2a4f authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

s390/cpu: split CPU reset into architectured functions 



s390 provides several CPU resets:
- CPU reset, clears interrupts, stop processing, clears TLB, but does
  not touch registers
- initial CPU reset, like CPU reset, but also clears PSW, prefix, FPC,
  timer and control registers. It does not touch gprs, fprs and acrs (!)
- Power on reset: the full monty

wire up CPUClass reset to the full monty, but provide the lesser resets
as part of S390CPUClass.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 29c6157c

target-s390x/cpu-qom.h

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
 * @parent_realize: The parent class' realize handler.

 * @parent_reset: The parent class' reset handler.

 * @load_normal: Performs a load normal.

 * @cpu_reset: Performs a CPU reset.

 * @initial_cpu_reset: Performs an initial CPU reset.

 *

 * An S/390 CPU model.

 */
@@ -48,6 +50,8 @@ typedef struct S390CPUClass { 
    DeviceRealize parent_realize;

    void (*parent_reset)(CPUState *cpu);

    void (*load_normal)(CPUState *cpu);

    void (*cpu_reset)(CPUState *cpu);

    void (*initial_cpu_reset)(CPUState *cpu);

} S390CPUClass;



/**

target-s390x/cpu.c

+35 −3
Original line number Diff line number Diff line
@@ -76,13 +76,44 @@ static void s390_cpu_load_normal(CPUState *s) 
}

#endif



/* CPUClass::reset() */

/* S390CPUClass::cpu_reset() */

static void s390_cpu_reset(CPUState *s)

{

    S390CPU *cpu = S390_CPU(s);

    S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);

    CPUS390XState *env = &cpu->env;



    s390_del_running_cpu(cpu);

    scc->parent_reset(s);

#if !defined(CONFIG_USER_ONLY)

    s->halted = 1;

#endif

    tlb_flush(env, 1);

}



/* S390CPUClass::initial_reset() */

static void s390_cpu_initial_reset(CPUState *s)

{

    S390CPU *cpu = S390_CPU(s);

    CPUS390XState *env = &cpu->env;



    s390_cpu_reset(s);

    /* initial reset does not touch regs,fregs and aregs */

    memset(&env->fpc, 0, offsetof(CPUS390XState, breakpoints) -

                         offsetof(CPUS390XState, fpc));



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

    env->cregs[0] = CR0_RESET;

    env->cregs[14] = CR14_RESET;

}



/* CPUClass:reset() */

static void s390_cpu_full_reset(CPUState *s)

{

    S390CPU *cpu = S390_CPU(s);

    S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);

    CPUS390XState *env = &cpu->env;



    s390_del_running_cpu(cpu);



    scc->parent_reset(s);
@@ -183,8 +214,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) 
#if !defined(CONFIG_USER_ONLY)

    scc->load_normal = s390_cpu_load_normal;

#endif

    cc->reset = s390_cpu_reset;



    scc->cpu_reset = s390_cpu_reset;

    scc->initial_cpu_reset = s390_cpu_initial_reset;

    cc->reset = s390_cpu_full_reset;

    cc->do_interrupt = s390_cpu_do_interrupt;

    cc->dump_state = s390_cpu_dump_state;

    cc->set_pc = s390_cpu_set_pc;