Commit d9f8bbd8 authored by Pekka Enberg's avatar Pekka Enberg Committed by Peter Maydell
Browse files

bcm2836: Make CPU type configurable 



This patch adds a "cpu-type" property to BCM2836 SoC in preparation for
reusing the code for the Raspberry Pi 3, which has a different processor
model.

Signed-off-by: default avatarPekka Enberg <penberg@iki.fi>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 57bb3156

hw/arm/bcm2836.c

+9 −8
Original line number Diff line number Diff line
@@ -26,14 +26,6 @@ 
static void bcm2836_init(Object *obj)

{

    BCM2836State *s = BCM2836(obj);

    int n;



    for (n = 0; n < BCM2836_NCPUS; n++) {

        object_initialize(&s->cpus[n], sizeof(s->cpus[n]),

                          "cortex-a15-" TYPE_ARM_CPU);

        object_property_add_child(obj, "cpu[*]", OBJECT(&s->cpus[n]),

                                  &error_abort);

    }



    object_initialize(&s->control, sizeof(s->control), TYPE_BCM2836_CONTROL);

    object_property_add_child(obj, "control", OBJECT(&s->control), NULL);
@@ -59,6 +51,14 @@ static void bcm2836_realize(DeviceState *dev, Error **errp) 


    /* common peripherals from bcm2835 */



    obj = OBJECT(dev);

    for (n = 0; n < BCM2836_NCPUS; n++) {

        object_initialize(&s->cpus[n], sizeof(s->cpus[n]),

                          s->cpu_type);

        object_property_add_child(obj, "cpu[*]", OBJECT(&s->cpus[n]),

                                  &error_abort);

    }



    obj = object_property_get_link(OBJECT(dev), "ram", &err);

    if (obj == NULL) {

        error_setg(errp, "%s: required ram link not found: %s",
@@ -150,6 +150,7 @@ static void bcm2836_realize(DeviceState *dev, Error **errp) 
}



static Property bcm2836_props[] = {

    DEFINE_PROP_STRING("cpu-type", BCM2836State, cpu_type),

    DEFINE_PROP_UINT32("enabled-cpus", BCM2836State, enabled_cpus, BCM2836_NCPUS),

    DEFINE_PROP_END_OF_LIST()

};

hw/arm/raspi.c

+3 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ static void raspi2_init(MachineState *machine) 
    /* Setup the SOC */

    object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram),

                                   &error_abort);

    object_property_set_str(OBJECT(&s->soc), machine->cpu_type, "cpu-type",

                            &error_abort);

    object_property_set_int(OBJECT(&s->soc), smp_cpus, "enabled-cpus",

                            &error_abort);

    object_property_set_int(OBJECT(&s->soc), 0xa21041, "board-rev",
@@ -166,6 +168,7 @@ static void raspi2_machine_init(MachineClass *mc) 
    mc->no_parallel = 1;

    mc->no_floppy = 1;

    mc->no_cdrom = 1;

    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15");

    mc->max_cpus = BCM2836_NCPUS;

    mc->min_cpus = BCM2836_NCPUS;

    mc->default_cpus = BCM2836_NCPUS;

include/hw/arm/bcm2836.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ typedef struct BCM2836State { 
    DeviceState parent_obj;

    /*< public >*/



    char *cpu_type;

    uint32_t enabled_cpus;



    ARMCPU cpus[BCM2836_NCPUS];