[Xen-devel,MM-PART2,v2,09/19] xen/arm64: head: Correctly report the HW CPU ID

Message ID 20190514122136.28215-18-julien.grall@arm.com
State Superseded
Headers show
  • xen/arm: Clean-up & fixes in boot/mm code
Related show

Commit Message

Julien Grall May 14, 2019, 12:21 p.m.
There are no reason to consider the HW CPU ID will be 0 when the
processor is part of a uniprocessor system. At best, this will result to
conflicting output as the rest of Xen use the value directly read from

So remove the zeroing and logic to check if the CPU is part of a
uniprocessor system.

Signed-off-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Andrii Anisov <andrii_anisov@epam.com>

    Changes in v2:
        - Add Andrii's reviewed-by
 xen/arch/arm/arm64/head.S | 6 ------
 1 file changed, 6 deletions(-)


diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
index b957eb90fb..08094a273e 100644
--- a/xen/arch/arm/arm64/head.S
+++ b/xen/arch/arm/arm64/head.S
@@ -277,15 +277,9 @@  GLOBAL(init_secondary)
         mov   x26, #1                /* X26 := skip_zero_bss */
-        mov   x24, #0                /* x24 := CPU ID. Initialy zero until we
-                                      * find that multiprocessor extensions are
-                                      * present and the system is SMP  */
         mrs   x0, mpidr_el1
-        tbnz  x0, _MPIDR_UP, 1f      /* Uniprocessor system? */
         ldr   x13, =(~MPIDR_HWID_MASK)
         bic   x24, x0, x13           /* Mask out flags to get CPU ID */
         /* Non-boot CPUs wait here until __cpu_up is ready for them */
         cbz   x22, 1f