xen/arm: Use the hardware ID to boot correctly secondary cpus

Secondary CPUs will spin in head.S until their MPIDR[23:0] correspond to
the smp_up_cpu. Actually Xen will set the value with the logical CPU ID
which is wrong. Use the cpu_logical_map to get the correct CPU ID.

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c
index 8ea4750fdf8e84da69d9ce4533dda54034cd5973..234748e92d37e1bdded4bb194cfb69323be96d92 100644 (file)
--- a/xen/arch/arm/smpboot.c
+++ b/xen/arch/arm/smpboot.c
@@ -127,8 +127,7 @@ make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset)
     for ( i = 1; i < max_cpus; i++ )
     {
         /* Tell the next CPU to get ready */
-        /* TODO: handle boards where CPUIDs are not contiguous */
-        *gate = i;
+        *gate = cpu_logical_map(i);
         flush_xen_dcache(*gate);
         isb();
         sev();
@@ -142,11 +141,12 @@ make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset)
 /* Boot the current CPU */
 void __cpuinit start_secondary(unsigned long boot_phys_offset,
                                unsigned long fdt_paddr,
-                               unsigned long cpuid)
+                               unsigned long hwid)
 {
+    unsigned int cpuid = init_data.cpuid;
+
     memset(get_cpu_info(), 0, sizeof (struct cpu_info));
 
-    /* TODO: handle boards where CPUIDs are not contiguous */
     set_processor_id(cpuid);
 
     current_cpu_data = boot_cpu_data;
@@ -233,9 +233,12 @@ int __cpu_up(unsigned int cpu)
     /* Tell the remote CPU which stack to boot on. */
     init_data.stack = idle_vcpu[cpu]->arch.stack;
 
+    /* Tell the remote CPU what is it's logical CPU ID */
+    init_data.cpuid = cpu;
+
     /* Unblock the CPU.  It should be waiting in the loop in head.S
      * for an event to arrive when smp_up_cpu matches its cpuid. */
-    smp_up_cpu = cpu;
+    smp_up_cpu = cpu_logical_map(cpu);
     /* we need to make sure that the change to smp_up_cpu is visible to
      * secondary cpus with D-cache off */
     flush_xen_dcache(smp_up_cpu);

diff --git a/xen/include/asm-arm/init.h b/xen/include/asm-arm/init.h
index 7a07136eb4551afa4184fc51a730896cbf3ca4a5..5ac8cf8797d6bf77d2bd983c7854ff86c1d14213 100644 (file)
--- a/xen/include/asm-arm/init.h
+++ b/xen/include/asm-arm/init.h
@@ -5,6 +5,8 @@ struct init_info
 {
     /* Pointer to the stack, used by head.S when entering in C */
     unsigned char *stack;
+    /* Logical CPU ID, used by start_secondary */
+    unsigned int cpuid;
 };
 
 #endif /* _XEN_ASM_INIT_H */