Commit 51e5ef45 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

arm: replace instance_post_init() 



Replace arm_cpu_post_init() instance callback by calling it from leaf
classes, to avoid potential ordering issue with other post_init callbacks.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Suggested-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Acked-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 50545b2c

target/arm/cpu-qom.h

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ struct arm_boot_info; 


#define TYPE_ARM_MAX_CPU "max-" TYPE_ARM_CPU



typedef struct ARMCPUInfo ARMCPUInfo;



/**

 * ARMCPUClass:

 * @parent_realize: The parent class' realize handler.
@@ -47,6 +49,7 @@ typedef struct ARMCPUClass { 
    CPUClass parent_class;

    /*< public >*/



    const ARMCPUInfo *info;

    DeviceRealize parent_realize;

    void (*parent_reset)(CPUState *cpu);

} ARMCPUClass;

target/arm/cpu.c

+24 −6
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ static Property arm_cpu_pmsav7_dregion_property = 
static Property arm_cpu_initsvtor_property =

            DEFINE_PROP_UINT32("init-svtor", ARMCPU, init_svtor, 0);



static void arm_cpu_post_init(Object *obj)

void arm_cpu_post_init(Object *obj)

{

    ARMCPU *cpu = ARM_CPU(obj);
@@ -1457,8 +1457,10 @@ static void cortex_m33_initfn(Object *obj) 


static void arm_v7m_class_init(ObjectClass *oc, void *data)

{

    ARMCPUClass *acc = ARM_CPU_CLASS(oc);

    CPUClass *cc = CPU_CLASS(oc);



    acc->info = data;

#ifndef CONFIG_USER_ONLY

    cc->do_interrupt = arm_v7m_cpu_do_interrupt;

#endif
@@ -1959,11 +1961,11 @@ static void arm_max_initfn(Object *obj) 


#endif /* !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) */



typedef struct ARMCPUInfo {

struct ARMCPUInfo {

    const char *name;

    void (*initfn)(Object *obj);

    void (*class_init)(ObjectClass *oc, void *data);

} ARMCPUInfo;

};



static const ARMCPUInfo arm_cpus[] = {

#if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64)
@@ -2113,6 +2115,7 @@ static void arm_host_initfn(Object *obj) 
    ARMCPU *cpu = ARM_CPU(obj);



    kvm_arm_set_cpu_features_from_host(cpu);

    arm_cpu_post_init(obj);

}



static const TypeInfo host_arm_cpu_type_info = {
@@ -2127,14 +2130,30 @@ static const TypeInfo host_arm_cpu_type_info = { 


#endif



static void arm_cpu_instance_init(Object *obj)

{

    ARMCPUClass *acc = ARM_CPU_GET_CLASS(obj);



    acc->info->initfn(obj);

    arm_cpu_post_init(obj);

}



static void cpu_register_class_init(ObjectClass *oc, void *data)

{

    ARMCPUClass *acc = ARM_CPU_CLASS(oc);



    acc->info = data;

}



static void cpu_register(const ARMCPUInfo *info)

{

    TypeInfo type_info = {

        .parent = TYPE_ARM_CPU,

        .instance_size = sizeof(ARMCPU),

        .instance_init = info->initfn,

        .instance_init = arm_cpu_instance_init,

        .class_size = sizeof(ARMCPUClass),

        .class_init = info->class_init,

        .class_init = info->class_init ?: cpu_register_class_init,

        .class_data = (void *)info,

    };



    type_info.name = g_strdup_printf("%s-" TYPE_ARM_CPU, info->name);
@@ -2147,7 +2166,6 @@ static const TypeInfo arm_cpu_type_info = { 
    .parent = TYPE_CPU,

    .instance_size = sizeof(ARMCPU),

    .instance_init = arm_cpu_initfn,

    .instance_post_init = arm_cpu_post_init,

    .instance_finalize = arm_cpu_finalizefn,

    .abstract = true,

    .class_size = sizeof(ARMCPUClass),

target/arm/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -884,6 +884,8 @@ static inline ARMCPU *arm_env_get_cpu(CPUARMState *env) 
    return container_of(env, ARMCPU, env);

}



void arm_cpu_post_init(Object *obj);



uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz);



#define ENV_GET_CPU(e) CPU(arm_env_get_cpu(e))

target/arm/cpu64.c

+20 −4
Original line number Diff line number Diff line
@@ -364,11 +364,11 @@ static void aarch64_max_initfn(Object *obj) 
    }

}



typedef struct ARMCPUInfo {

struct ARMCPUInfo {

    const char *name;

    void (*initfn)(Object *obj);

    void (*class_init)(ObjectClass *oc, void *data);

} ARMCPUInfo;

};



static const ARMCPUInfo aarch64_cpus[] = {

    { .name = "cortex-a57",         .initfn = aarch64_a57_initfn },
@@ -452,14 +452,30 @@ static void aarch64_cpu_class_init(ObjectClass *oc, void *data) 
    cc->gdb_arch_name = aarch64_gdb_arch_name;

}



static void aarch64_cpu_instance_init(Object *obj)

{

    ARMCPUClass *acc = ARM_CPU_GET_CLASS(obj);



    acc->info->initfn(obj);

    arm_cpu_post_init(obj);

}



static void cpu_register_class_init(ObjectClass *oc, void *data)

{

    ARMCPUClass *acc = ARM_CPU_CLASS(oc);



    acc->info = data;

}



static void aarch64_cpu_register(const ARMCPUInfo *info)

{

    TypeInfo type_info = {

        .parent = TYPE_AARCH64_CPU,

        .instance_size = sizeof(ARMCPU),

        .instance_init = info->initfn,

        .instance_init = aarch64_cpu_instance_init,

        .class_size = sizeof(ARMCPUClass),

        .class_init = info->class_init,

        .class_init = info->class_init ?: cpu_register_class_init,

        .class_data = (void *)info,

    };



    type_info.name = g_strdup_printf("%s-" TYPE_ARM_CPU, info->name);