[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-9.0 06/11] hw/arm/bcm2836: Simplify use of 'reset-cbar' prope
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH-for-9.0 06/11] hw/arm/bcm2836: Simplify use of 'reset-cbar' property |
Date: |
Wed, 22 Nov 2023 19:30:42 +0100 |
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(-)
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),
--
2.41.0
- [PATCH-for-9.0 04/11] target/arm: Move ARM_CPU_IRQ/FIQ definitions to 'cpu-qom.h', (continued)
[PATCH-for-9.0 05/11] target/arm: Move GTIMER definitions to 'cpu-defs.h', Philippe Mathieu-Daudé, 2023/11/22
[PATCH-for-9.0 06/11] hw/arm/bcm2836: Simplify use of 'reset-cbar' property,
Philippe Mathieu-Daudé <=
[PATCH-for-9.0 07/11] hw/arm/bcm2836: Simplify access to 'start-powered-off' property, Philippe Mathieu-Daudé, 2023/11/22
[PATCH-for-9.0 08/11] hw/arm/bcm2836: Use ARM_CPU 'mp-affinity' property, Philippe Mathieu-Daudé, 2023/11/22
[RFC PATCH-for-9.0 09/11] hw/arm/bcm2836: Allocate ARM CPU state with object_new(), Philippe Mathieu-Daudé, 2023/11/22
[RFC PATCH-for-9.0 11/11] hw/intc/meson: Simplify how arm_gicv3_kvm.o objects are built, Philippe Mathieu-Daudé, 2023/11/22
[RFC PATCH-for-9.0 10/11] hw/arm/raspi: Build bcm2836.o and raspi.o objects once, Philippe Mathieu-Daudé, 2023/11/22