[Qemu-devel] [PATCH 11/23] PPC: E500: Use spin code for secondary CPUs

[Alexander Graf <agraf@suse.de>]

When running with more than one CPU in -kernel mode, we need to have the
secondary CPUs spin in a special u-boot compatible loop that reads out a
so called "spin table" and checks for updates.

This patch makes sure secondary CPUs use the spin code and execute it
first thing when they execute.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/ppce500_mpc8544ds.c |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index 7ce9bc7..0c6cdf2 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -227,6 +227,8 @@ static void mpc8544ds_init(ram_addr_t ram_size,
 {
     PCIBus *pci_bus;
     CPUState *env = NULL;
+    char *spin_filename;
+    uint64_t spin_entry;
     uint64_t elf_entry;
     uint64_t elf_lowaddr;
     target_phys_addr_t entry=0;
@@ -242,6 +244,15 @@ static void mpc8544ds_init(ram_addr_t ram_size,
     struct boot_info *boot_info;
     CPUState *firstenv = NULL;
 
+    /* Register Memory */
+    cpu_register_physical_memory(0, ram_size, qemu_ram_alloc(NULL,
+                                 "mpc8544ds.ram", ram_size));
+
+    /* Load Spin Code */
+    spin_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "ppc_spin.elf");
+    load_elf(spin_filename, NULL, NULL, &spin_entry,
+             NULL, NULL, 1, ELF_MACHINE, 0);
+
     /* Setup CPUs */
     if (cpu_model == NULL) {
         cpu_model = "e500v2_v30";
@@ -276,6 +287,8 @@ static void mpc8544ds_init(ram_addr_t ram_size,
         /* Register reset handler */
         boot_info = qemu_mallocz(sizeof(struct boot_info));
         qemu_register_reset(mpc8544ds_cpu_reset, env);
+        boot_info->entry = spin_entry;
+        boot_info->dt_base = 0x7800000 + (i * 0x100);
         env->load_info = boot_info;
     }
 
@@ -284,10 +297,6 @@ static void mpc8544ds_init(ram_addr_t ram_size,
     /* Fixup Memory size on a alignment boundary */
     ram_size &= ~(RAM_SIZES_ALIGN - 1);
 
-    /* Register Memory */
-    cpu_register_physical_memory(0, ram_size, qemu_ram_alloc(NULL,
-                                 "mpc8544ds.ram", ram_size));
-
     /* MPIC */
     mpic = mpic_init(MPC8544_MPIC_REGS_BASE, smp_cpus, irqs, NULL);
 
-- 
1.6.0.2