Re: [Xen-devel] [PATCH V2 01/46] xen: arm32: Don't bother with the bootloader provided ARM-Linux machine type

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2013-02-14 at 16:47 +0000, Ian Campbell wrote:
> Everything is DTB based and on 64-bit there is no such concept even in
> Linux.
> 
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

Stefano Acked in
<alpine.DEB.2.02.1301241739070.29727@xxxxxxxxxxxxxxxxxxxxxxx> which I
missed picking up here. Applied, thanks.

> ---
> v2: Update start_secondary too.
> ---
>  xen/arch/arm/arm32/head.S |    7 +++----
>  xen/arch/arm/setup.c      |    1 -
>  xen/arch/arm/smpboot.c    |    1 -
>  3 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S
> index 20e9da6..92fc36c 100644
> --- a/xen/arch/arm/arm32/head.S
> +++ b/xen/arch/arm/arm32/head.S
> @@ -72,7 +72,7 @@ past_zImage:
>          cpsid aif                    /* Disable all interrupts */
>  
>          /* Save the bootloader arguments in less-clobberable registers */
> -        mov   r7, r1                 /* r7 := ARM-linux machine type */
> +        /* No need to save r1 == Unused ARM-linux machine type */
>          mov   r8, r2                 /* r8 := ATAG base address */
>  
>          /* Find out where we are */
> @@ -334,9 +334,8 @@ launch:
>          add   sp, #STACK_SIZE        /* (which grows down from the top). */
>          sub   sp, #CPUINFO_sizeof    /* Make room for CPU save record */
>          mov   r0, r10                /* Marshal args: - phys_offset */
> -        mov   r1, r7                 /*               - machine type */
> -        mov   r2, r8                 /*               - ATAG address */
> -        movs  r3, r12                /*               - CPU ID */
> +        mov   r1, r8                 /*               - ATAG address */
> +        movs  r2, r12                /*               - CPU ID */
>          beq   start_xen              /* and disappear into the land of C */
>          b     start_secondary        /* (to the appropriate entry point) */
>  
> diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
> index acb7abb..782d252 100644
> --- a/xen/arch/arm/setup.c
> +++ b/xen/arch/arm/setup.c
> @@ -329,7 +329,6 @@ void __init setup_cache(void)
>  
>  /* C entry point for boot CPU */
>  void __init start_xen(unsigned long boot_phys_offset,
> -                      unsigned long arm_type,
>                        unsigned long atag_paddr,
>                        unsigned long cpuid)
>  {
> diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c
> index c7a586b..da4880c 100644
> --- a/xen/arch/arm/smpboot.c
> +++ b/xen/arch/arm/smpboot.c
> @@ -132,7 +132,6 @@ 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 arm_type,
>                                 unsigned long atag_paddr,
>                                 unsigned long cpuid)
>  {



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel