mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/bcm2836: Only provide "enabled-cpus" property to multicore SoCs

Browse Source 
It makes no sense to set enabled-cpus=0 on single core SoCs.

Reviewed-by: Luc Michel <luc.michel@greensocs.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20201024170127.3592182-5-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-10-24 19:01:22 +02:00 committed by Peter Maydell
parent 25ea288459
commit 96c741d7ce
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/arm/bcm2836.c
View File

@ -34,6 +34,9 @@ typedef struct BCM283XClass {
#define BCM283X_GET_CLASS(obj) \ #define BCM283X_GET_CLASS(obj) \
OBJECT_GET_CLASS(BCM283XClass, (obj), TYPE_BCM283X) OBJECT_GET_CLASS(BCM283XClass, (obj), TYPE_BCM283X)
static Property bcm2836_enabled_cores_property =
DEFINE_PROP_UINT32("enabled-cpus", BCM283XState, enabled_cpus, 0);
static void bcm2836_init(Object *obj) static void bcm2836_init(Object *obj)
{ {
BCM283XState *s = BCM283X(obj); BCM283XState *s = BCM283X(obj);
@ -44,6 +47,10 @@ static void bcm2836_init(Object *obj)
object_initialize_child(obj, "cpu[*]", &s->cpu[n].core, object_initialize_child(obj, "cpu[*]", &s->cpu[n].core,
bc->cpu_type); bc->cpu_type);
} }
if (bc->core_count > 1) {
qdev_property_add_static(DEVICE(obj), &bcm2836_enabled_cores_property);
qdev_prop_set_uint32(DEVICE(obj), "enabled-cpus", bc->core_count);
}
object_initialize_child(obj, "control", &s->control, TYPE_BCM2836_CONTROL); object_initialize_child(obj, "control", &s->control, TYPE_BCM2836_CONTROL);
@ -130,12 +137,6 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
} }
} }
static Property bcm2836_props[] = {
DEFINE_PROP_UINT32("enabled-cpus", BCM283XState, enabled_cpus,
BCM283X_NCPUS),
DEFINE_PROP_END_OF_LIST()
};
static void bcm283x_class_init(ObjectClass *oc, void *data) static void bcm283x_class_init(ObjectClass *oc, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(oc); DeviceClass *dc = DEVICE_CLASS(oc);
@ -155,7 +156,6 @@ static void bcm2836_class_init(ObjectClass *oc, void *data)
bc->ctrl_base = 0x40000000; bc->ctrl_base = 0x40000000;
bc->clusterid = 0xf; bc->clusterid = 0xf;
dc->realize = bcm2836_realize; dc->realize = bcm2836_realize;
device_class_set_props(dc, bcm2836_props);
}; };
#ifdef TARGET_AARCH64 #ifdef TARGET_AARCH64
@ -170,7 +170,6 @@ static void bcm2837_class_init(ObjectClass *oc, void *data)
bc->ctrl_base = 0x40000000; bc->ctrl_base = 0x40000000;
bc->clusterid = 0x0; bc->clusterid = 0x0;
dc->realize = bcm2836_realize; dc->realize = bcm2836_realize;
device_class_set_props(dc, bcm2836_props);
}; };
#endif #endif