[Qemu-devel] [PATCH 2/3] hw/arm/vexpress: introduce VEDBoardInfo::smp_bootreg_addr

[Sergey Fedorov]

Require secondary CPU release address to be specified explicitly in each
daughterboard info structure.

Signed-off-by: Sergey Fedorov <address@hidden>
---
 hw/arm/vexpress.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 8496c16..97ccf15 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -186,6 +186,7 @@ struct VEDBoardInfo {
     struct arm_boot_info bootinfo;
     const hwaddr *motherboard_map;
     hwaddr loader_start;
+    hwaddr smp_bootreg_addr;
     const hwaddr gic_cpu_if_addr;
     uint32_t proc_id;
     uint32_t num_voltage_sensors;
@@ -337,6 +338,7 @@ static const uint32_t a9_clocks[] = {
 static VEDBoardInfo a9_daughterboard = {
     .motherboard_map = motherboard_legacy_map,
     .loader_start = 0x60000000,
+    .smp_bootreg_addr = 0x10000030,
     .gic_cpu_if_addr = 0x1e000100,
     .proc_id = 0x0c000191,
     .num_voltage_sensors = ARRAY_SIZE(a9_voltages),
@@ -418,6 +420,7 @@ static const uint32_t a15_clocks[] = {
 static VEDBoardInfo a15_daughterboard = {
     .motherboard_map = motherboard_aseries_map,
     .loader_start = 0x80000000,
+    .smp_bootreg_addr = 0x1c010030,
     .gic_cpu_if_addr = 0x2c002000,
     .proc_id = 0x14000237,
     .num_voltage_sensors = ARRAY_SIZE(a15_voltages),
@@ -700,7 +703,7 @@ static void vexpress_common_init(MachineState *machine)
     daughterboard->bootinfo.board_id = VEXPRESS_BOARD_ID;
     daughterboard->bootinfo.loader_start = daughterboard->loader_start;
     daughterboard->bootinfo.smp_loader_start = map[VE_SRAM];
-    daughterboard->bootinfo.smp_bootreg_addr = map[VE_SYSREGS] + 0x30;
+    daughterboard->bootinfo.smp_bootreg_addr = daughterboard->smp_bootreg_addr;
     daughterboard->bootinfo.gic_cpu_if_addr = daughterboard->gic_cpu_if_addr;
     daughterboard->bootinfo.modify_dtb = vexpress_modify_dtb;
     /* Indicate that when booting Linux we should be in secure state */
-- 
2.3.4