| Message ID | 20231122183048.17150-7-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/arm: Step toward building qemu-system-{arm, aarch64} altogether | expand |
On 11/22/23 12:30, Philippe Mathieu-Daudé wrote: > bcm2836_realize() is called by > > - bcm2836_class_init() which sets: > > bc->cpu_type = ARM_CPU_TYPE_NAME("cortex-a7") > > - bcm2837_class_init() which sets: > > bc->cpu_type = ARM_CPU_TYPE_NAME("cortex-a53") > > Both Cortex-A7 / A53 have the ARM_FEATURE_CBAR set. If it isn't, > then this is a programming error: use &error_abort. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 6986b71cb4..055c909e95 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -132,10 +132,8 @@ static void bcm2836_realize(DeviceState *dev, Error **errp) s->cpu[n].core.mp_affinity = (bc->clusterid << 8) | n; /* set periphbase/CBAR value for CPU-local registers */ - if (!object_property_set_int(OBJECT(&s->cpu[n].core), "reset-cbar", - bc->peri_base, errp)) { - return; - } + object_property_set_int(OBJECT(&s->cpu[n].core), "reset-cbar", + bc->peri_base, &error_abort); /* start powered off if not enabled */ if (!object_property_set_bool(OBJECT(&s->cpu[n].core),
bcm2836_realize() is called by - bcm2836_class_init() which sets: bc->cpu_type = ARM_CPU_TYPE_NAME("cortex-a7") - bcm2837_class_init() which sets: bc->cpu_type = ARM_CPU_TYPE_NAME("cortex-a53") Both Cortex-A7 / A53 have the ARM_FEATURE_CBAR set. If it isn't, then this is a programming error: use &error_abort. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/arm/bcm2836.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)