| Message ID | 20190514122456.28559-6-julien.grall@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | xen/arm: Clean-up & fixes in boot/mm code | expand |
On 14.05.19 15:24, Julien Grall wrote: > The parameter cpuid is not used by start_xen. So remove it. > > Signed-off-by: Julien Grall <julien.grall@arm.com> > > --- > - Re-order the patch with "xen/arm: Rework secondary_start > prototype" > --- Reviewed-by: Andrii Anisov <andrii_anisov@epam.com>
Hi Stefano, Gentle ping, you have acked the other patches but not this patch. I can't merge them without this one. Cheers, On 21/05/2019 11:01, Andrii Anisov wrote: > > > On 14.05.19 15:24, Julien Grall wrote: >> The parameter cpuid is not used by start_xen. So remove it. >> >> Signed-off-by: Julien Grall <julien.grall@arm.com> >> >> --- >> - Re-order the patch with "xen/arm: Rework secondary_start >> prototype" >> --- > > Reviewed-by: Andrii Anisov <andrii_anisov@epam.com> >
On Tue, 14 May 2019, Julien Grall wrote: > The parameter cpuid is not used by start_xen. So remove it. > > Signed-off-by: Julien Grall <julien.grall@arm.com> Acked-by: Stefano Stabellini <sstabellini@kernel.org> > --- > - Re-order the patch with "xen/arm: Rework secondary_start > prototype" > --- > 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 8a98607459..cb8a3bf829 100644 > --- a/xen/arch/arm/arm32/head.S > +++ b/xen/arch/arm/arm32/head.S > @@ -447,7 +447,6 @@ launch: > sub sp, #CPUINFO_sizeof /* Make room for CPU save record */ > mov r0, r10 /* Marshal args: - phys_offset */ > mov r1, r8 /* - DTB address */ > - mov r2, r7 /* - CPU ID */ > teq r12, #0 > 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 4fe904c51d..075013878e 100644 > --- a/xen/arch/arm/arm64/head.S > +++ b/xen/arch/arm/arm64/head.S > @@ -584,7 +584,6 @@ launch: > > mov x0, x20 /* Marshal args: - phys_offset */ > mov x1, x21 /* - FDT */ > - mov x2, x24 /* - CPU ID */ > cbnz x22, 1f > b start_xen /* and disappear into the land of C */ > 1: > diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c > index faaf029b99..2f714d8b37 100644 > --- a/xen/arch/arm/setup.c > +++ b/xen/arch/arm/setup.c > @@ -733,8 +733,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; > -- > 2.11.0 >
diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 8a98607459..cb8a3bf829 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -447,7 +447,6 @@ launch: sub sp, #CPUINFO_sizeof /* Make room for CPU save record */ mov r0, r10 /* Marshal args: - phys_offset */ mov r1, r8 /* - DTB address */ - mov r2, r7 /* - CPU ID */ teq r12, #0 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 4fe904c51d..075013878e 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -584,7 +584,6 @@ launch: mov x0, x20 /* Marshal args: - phys_offset */ mov x1, x21 /* - FDT */ - mov x2, x24 /* - CPU ID */ cbnz x22, 1f b start_xen /* and disappear into the land of C */ 1: diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index faaf029b99..2f714d8b37 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -733,8 +733,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;
The parameter cpuid is not used by start_xen. So remove it. Signed-off-by: Julien Grall <julien.grall@arm.com> --- - Re-order the patch with "xen/arm: Rework secondary_start prototype" --- 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(-)