SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/arm: Convert to 3-phase reset

Browse Source 
Convert the Arm CPU class to use 3-phase reset, so it doesn't
need to use device_class_set_parent_reset() any more.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-id: 20221124115023.2437291-3-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2022-11-24 11:50:05 +00:00
parent 3b750f1b1a
commit 9130cade5f
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/arm/cpu-qom.h
View File

@ -43,7 +43,7 @@ void aarch64_cpu_register(const ARMCPUInfo *info);
/** /**
* ARMCPUClass: * ARMCPUClass:
* @parent_realize: The parent class' realize handler. * @parent_realize: The parent class' realize handler.
* @parent_reset: The parent class' reset handler. * @parent_phases: The parent class' reset phase handlers.
* *
* An ARM CPU model. * An ARM CPU model.
*/ */
@ -54,7 +54,7 @@ struct ARMCPUClass {
const ARMCPUInfo *info; const ARMCPUInfo *info;
DeviceRealize parent_realize; DeviceRealize parent_realize;
DeviceReset parent_reset; ResettablePhases parent_phases;
}; };

13
target/arm/cpu.c
View File

@ -202,14 +202,16 @@ static void cp_reg_check_reset(gpointer key, gpointer value, gpointer opaque)
assert(oldvalue == newvalue); assert(oldvalue == newvalue);
} }
static void arm_cpu_reset(DeviceState *dev) static void arm_cpu_reset_hold(Object *obj)
{ {
CPUState *s = CPU(dev); CPUState *s = CPU(obj);
ARMCPU *cpu = ARM_CPU(s); ARMCPU *cpu = ARM_CPU(s);
ARMCPUClass *acc = ARM_CPU_GET_CLASS(cpu); ARMCPUClass *acc = ARM_CPU_GET_CLASS(cpu);
CPUARMState *env = &cpu->env; CPUARMState *env = &cpu->env;
acc->parent_reset(dev); if (acc->parent_phases.hold) {
acc->parent_phases.hold(obj);
}
memset(env, 0, offsetof(CPUARMState, end_reset_fields)); memset(env, 0, offsetof(CPUARMState, end_reset_fields));
@ -2211,12 +2213,15 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)
ARMCPUClass *acc = ARM_CPU_CLASS(oc); ARMCPUClass *acc = ARM_CPU_CLASS(oc);
CPUClass *cc = CPU_CLASS(acc); CPUClass *cc = CPU_CLASS(acc);
DeviceClass *dc = DEVICE_CLASS(oc); DeviceClass *dc = DEVICE_CLASS(oc);
ResettableClass *rc = RESETTABLE_CLASS(oc);
device_class_set_parent_realize(dc, arm_cpu_realizefn, device_class_set_parent_realize(dc, arm_cpu_realizefn,
&acc->parent_realize); &acc->parent_realize);
device_class_set_props(dc, arm_cpu_properties); device_class_set_props(dc, arm_cpu_properties);
device_class_set_parent_reset(dc, arm_cpu_reset, &acc->parent_reset);
resettable_class_set_parent_phases(rc, NULL, arm_cpu_reset_hold, NULL,
&acc->parent_phases);
cc->class_by_name = arm_cpu_class_by_name; cc->class_by_name = arm_cpu_class_by_name;
cc->has_work = arm_cpu_has_work; cc->has_work = arm_cpu_has_work;