| Message ID | 20171005120914.465582-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 703ef76b8fd5169d5cff30de5b958d6728b9a147 |
| Headers | show |
| Series | ARM: shmobile: rcar-gen2: fix non-SMP build | expand |
Hi Arnd, On Thu, Oct 5, 2017 at 2:09 PM, Arnd Bergmann <arnd@arndb.de> wrote: > A bugfix for the SMP case broke the build for the UP case: > > arch/arm/mach-shmobile/headsmp-apmu.o: In function `shmobile_boot_apmu': > (.text+0x34): undefined reference to `secondary_startup' > > The assembler file mixes code that is used for SMP with code > that we also need on a single-CPU build, so I'm leaving it > always enabled in the Makefile, but enclose the SMP code > in an #ifdef. Oops, sorry for that. Looks like 0-day doesn't do UP builds? > 3fd45a136ff6 ("ARM: shmobile: rcar-gen2: Make sure CNTVOFF is initialized on CA7/15") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> ;-) > --- > arch/arm/mach-shmobile/headsmp-apmu.S | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S > index db4743d2bf91..5672b5849401 100644 > --- a/arch/arm/mach-shmobile/headsmp-apmu.S > +++ b/arch/arm/mach-shmobile/headsmp-apmu.S As this hasn't been pulled into arm-soc yet (pull request sent though), perhaps Simon should squash this fix into the original commit? Should we rename headsmp-apmu.S to head-apmu.S? Thanks! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Thu, Oct 5, 2017 at 2:25 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Thu, Oct 5, 2017 at 2:09 PM, Arnd Bergmann <arnd@arndb.de> wrote: >> arch/arm/mach-shmobile/headsmp-apmu.S | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S >> index db4743d2bf91..5672b5849401 100644 >> --- a/arch/arm/mach-shmobile/headsmp-apmu.S >> +++ b/arch/arm/mach-shmobile/headsmp-apmu.S > > As this hasn't been pulled into arm-soc yet (pull request sent though), > perhaps Simon should squash this fix into the original commit? > Should we rename headsmp-apmu.S to head-apmu.S? I'm fine with it either way, just do whatever works best for you here. Arnd
On Thu, Oct 05, 2017 at 10:29:47PM +0200, Arnd Bergmann wrote: > On Thu, Oct 5, 2017 at 2:25 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > On Thu, Oct 5, 2017 at 2:09 PM, Arnd Bergmann <arnd@arndb.de> wrote: > >> arch/arm/mach-shmobile/headsmp-apmu.S | 2 ++ > >> 1 file changed, 2 insertions(+) > >> > >> diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S > >> index db4743d2bf91..5672b5849401 100644 > >> --- a/arch/arm/mach-shmobile/headsmp-apmu.S > >> +++ b/arch/arm/mach-shmobile/headsmp-apmu.S > > > > As this hasn't been pulled into arm-soc yet (pull request sent though), > > perhaps Simon should squash this fix into the original commit? > > Should we rename headsmp-apmu.S to head-apmu.S? > > I'm fine with it either way, just do whatever works best for you here. My preference is to send a second pull request with this patch on top of the previous pull request. Arnd does that work for you?
On Fri, Oct 06, 2017 at 11:28:56AM +0200, Simon Horman wrote: > On Thu, Oct 05, 2017 at 10:29:47PM +0200, Arnd Bergmann wrote: > > On Thu, Oct 5, 2017 at 2:25 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > > On Thu, Oct 5, 2017 at 2:09 PM, Arnd Bergmann <arnd@arndb.de> wrote: > > >> arch/arm/mach-shmobile/headsmp-apmu.S | 2 ++ > > >> 1 file changed, 2 insertions(+) > > >> > > >> diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S > > >> index db4743d2bf91..5672b5849401 100644 > > >> --- a/arch/arm/mach-shmobile/headsmp-apmu.S > > >> +++ b/arch/arm/mach-shmobile/headsmp-apmu.S > > > > > > As this hasn't been pulled into arm-soc yet (pull request sent though), > > > perhaps Simon should squash this fix into the original commit? > > > Should we rename headsmp-apmu.S to head-apmu.S? > > > > I'm fine with it either way, just do whatever works best for you here. > > My preference is to send a second pull request with this patch on top of the > previous pull request. Arnd does that work for you? In the mean time I pushed the patch to the next branch of the renesas tree so it should appear in linux-next in the not to distant future.
diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S index db4743d2bf91..5672b5849401 100644 --- a/arch/arm/mach-shmobile/headsmp-apmu.S +++ b/arch/arm/mach-shmobile/headsmp-apmu.S @@ -31,7 +31,9 @@ ENTRY(shmobile_init_cntvoff) ret lr ENDPROC(shmobile_init_cntvoff) +#ifdef CONFIG_SMP ENTRY(shmobile_boot_apmu) bl shmobile_init_cntvoff b secondary_startup ENDPROC(shmobile_boot_apmu) +#endif
A bugfix for the SMP case broke the build for the UP case: arch/arm/mach-shmobile/headsmp-apmu.o: In function `shmobile_boot_apmu': (.text+0x34): undefined reference to `secondary_startup' The assembler file mixes code that is used for SMP with code that we also need on a single-CPU build, so I'm leaving it always enabled in the Makefile, but enclose the SMP code in an #ifdef. 3fd45a136ff6 ("ARM: shmobile: rcar-gen2: Make sure CNTVOFF is initialized on CA7/15") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-shmobile/headsmp-apmu.S | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0