[Xen-devel,06/20] xen/arm: Remove parameter cpuid from start_xen

Message ID 20190422164937.21350-7-julien.grall@arm.com
State New
Headers show
Series
  • xen/arm: Clean-up & fixes in boot/mm code
Related show

Commit Message

Julien Grall April 22, 2019, 4:49 p.m.
The parameter cpuid is not used by start_xen. So remove it.

Signed-off-by: Julien Grall <julien.grall@arm.com>
---
 xen/arch/arm/arm32/head.S | 1 -
 xen/arch/arm/arm64/head.S | 1 -
 xen/arch/arm/setup.c      | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)

Comments

Andrii Anisov May 3, 2019, 3:56 p.m. | #1
Hello Julien,

On 22.04.19 19:49, Julien Grall wrote:
> The parameter cpuid is not used by start_xen. So remove it.
> 
> Signed-off-by: Julien Grall <julien.grall@arm.com>
> ---
>   xen/arch/arm/arm32/head.S | 1 -
>   xen/arch/arm/arm64/head.S | 1 -
>   xen/arch/arm/setup.c      | 3 +--
>   3 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S
> index b71d7fb11d..9f40face98 100644
> --- a/xen/arch/arm/arm32/head.S
> +++ b/xen/arch/arm/arm32/head.S
> @@ -448,7 +448,6 @@ launch:
>           teq   r12, #0
>           moveq r0, r10                /* Marshal args: - phys_offset */
>           moveq r1, r8                 /*               - DTB address */
> -        moveq r2, r7                 /*               - CPU ID */

I don't really like making changes which are then fixed in next patches.
I'd like to see it coupled this with the previous patch.

>           beq   start_xen              /* and disappear into the land of C */
>           b     start_secondary        /* (to the appropriate entry point) */
>   
> diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
> index b26126de53..cb30d6f22e 100644
> --- a/xen/arch/arm/arm64/head.S
> +++ b/xen/arch/arm/arm64/head.S
> @@ -586,7 +586,6 @@ launch:
>   
>           mov   x0, x20                /* Marshal args: - phys_offset */
>           mov   x1, x21                /*               - FDT */
> -        mov   x2, x24                /*               - CPU ID */
>           b     start_xen              /* and disappear into the land of C */
>   1:
>           b     start_secondary        /* (to the appropriate entry point) */
> diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
> index ccb0f181ea..6dfbba2927 100644
> --- a/xen/arch/arm/setup.c
> +++ b/xen/arch/arm/setup.c
> @@ -728,8 +728,7 @@ size_t __read_mostly dcache_line_bytes;
>   
>   /* C entry point for boot CPU */
>   void __init start_xen(unsigned long boot_phys_offset,
> -                      unsigned long fdt_paddr,
> -                      unsigned long cpuid)
> +                      unsigned long fdt_paddr)
>   {
>       size_t fdt_size;
>       int cpus, i;
> 

Though:

Reviewed-by: Andrii Anisov <andrii_anisov@epam.com>
Julien Grall May 3, 2019, 4:17 p.m. | #2
Hi,

On 03/05/2019 16:56, Andrii Anisov wrote:
> On 22.04.19 19:49, Julien Grall wrote:
>> The parameter cpuid is not used by start_xen. So remove it.
>>
>> Signed-off-by: Julien Grall <julien.grall@arm.com>
>> ---
>>   xen/arch/arm/arm32/head.S | 1 -
>>   xen/arch/arm/arm64/head.S | 1 -
>>   xen/arch/arm/setup.c      | 3 +--
>>   3 files changed, 1 insertion(+), 4 deletions(-)
>>
>> diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S
>> index b71d7fb11d..9f40face98 100644
>> --- a/xen/arch/arm/arm32/head.S
>> +++ b/xen/arch/arm/arm32/head.S
>> @@ -448,7 +448,6 @@ launch:
>>           teq   r12, #0
>>           moveq r0, r10                /* Marshal args: - phys_offset */
>>           moveq r1, r8                 /*               - DTB address */
>> -        moveq r2, r7                 /*               - CPU ID */
> 
> I don't really like making changes which are then fixed in next patches.
> I'd like to see it coupled this with the previous patch.

They are two different changes... one deal with start_xen the other deal with 
secondary_start.

I can offer to reshuffle the patches so this one is before #5, but not merge them.

Cheers,
Andrii Anisov May 3, 2019, 4:19 p.m. | #3
On 03.05.19 19:17, Julien Grall wrote:
> I can offer to reshuffle the patches so this one is before #5, but not merge them.

Good option. I like it.

Patch

diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S
index b71d7fb11d..9f40face98 100644
--- a/xen/arch/arm/arm32/head.S
+++ b/xen/arch/arm/arm32/head.S
@@ -448,7 +448,6 @@  launch:
         teq   r12, #0
         moveq r0, r10                /* Marshal args: - phys_offset */
         moveq r1, r8                 /*               - DTB address */
-        moveq r2, r7                 /*               - 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/arm64/head.S b/xen/arch/arm/arm64/head.S
index b26126de53..cb30d6f22e 100644
--- a/xen/arch/arm/arm64/head.S
+++ b/xen/arch/arm/arm64/head.S
@@ -586,7 +586,6 @@  launch:
 
         mov   x0, x20                /* Marshal args: - phys_offset */
         mov   x1, x21                /*               - FDT */
-        mov   x2, x24                /*               - CPU ID */
         b     start_xen              /* and disappear into the land of C */
 1:
         b     start_secondary        /* (to the appropriate entry point) */
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index ccb0f181ea..6dfbba2927 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -728,8 +728,7 @@  size_t __read_mostly dcache_line_bytes;
 
 /* C entry point for boot CPU */
 void __init start_xen(unsigned long boot_phys_offset,
-                      unsigned long fdt_paddr,
-                      unsigned long cpuid)
+                      unsigned long fdt_paddr)
 {
     size_t fdt_size;
     int cpus, i;