diff mbox

[v3,6/6] xen/arm: Use the hardware ID to boot correctly secondary cpus

Message ID 1379510122-9467-7-git-send-email-julien.grall@linaro.org
State Superseded, archived
Headers show

Commit Message

Julien Grall Sept. 18, 2013, 1:15 p.m. UTC 
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>
---
    Changes in v2:
        - Replace Acked-by by a s-o-b
        - s/TMP/to in commit title
---
 xen/arch/arm/smpboot.c |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

Comments

Ian Campbell Sept. 25, 2013, 3:41 p.m. UTC | #1 
On Wed, 2013-09-18 at 14:15 +0100, Julien Grall wrote:
> +    /* Browse the logical map and find the associate logical cpu ID */

We already have init_stack (the stack for the cpu which is coming up to
use). In my start of day rewrite I also add/extend init_ttbr. You could
add init_cpu_id or something.

TBH it's getting to the point where we might want struct init_info
{ ... }

> +    for ( cpuid = 1; cpuid < nr_cpu_ids; cpuid++ )
> +    {
> +        if ( cpu_logical_map(cpuid) == hwid )
> +            break;
> +    }
> +
Julien Grall Sept. 26, 2013, 10:18 a.m. UTC | #2 
On 09/25/2013 04:41 PM, Ian Campbell wrote:
> On Wed, 2013-09-18 at 14:15 +0100, Julien Grall wrote:
>> +    /* Browse the logical map and find the associate logical cpu ID */
> 
> We already have init_stack (the stack for the cpu which is coming up to
> use). In my start of day rewrite I also add/extend init_ttbr. You could
> add init_cpu_id or something.
> TBH it's getting to the point where we might want struct init_info
> { ... }

Good idea. I will add a patch for this solution in my patch series.

>> +    for ( cpuid = 1; cpuid < nr_cpu_ids; cpuid++ )
>> +    {
>> +        if ( cpu_logical_map(cpuid) == hwid )
>> +            break;
>> +    }
>> +
>
diff mbox

Patch

diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c
index c0d25de..1952287 100644
--- a/xen/arch/arm/smpboot.c
+++ b/xen/arch/arm/smpboot.c
@@ -124,8 +124,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();
@@ -139,11 +138,22 @@  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;
+
     memset(get_cpu_info(), 0, sizeof (struct cpu_info));
 
-    /* TODO: handle boards where CPUIDs are not contiguous */
+    /* Browse the logical map and find the associate logical cpu ID */
+    for ( cpuid = 1; cpuid < nr_cpu_ids; cpuid++ )
+    {
+        if ( cpu_logical_map(cpuid) == hwid )
+            break;
+    }
+
+    if ( cpuid == nr_cpu_ids )
+        panic("Can't find logical CPU id for cpu MPIDR[23:0] = 0x%lx\n", hwid);
+
     set_processor_id(cpuid);
 
     current_cpu_data = boot_cpu_data;
@@ -232,7 +242,7 @@  int __cpu_up(unsigned int 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);