mbox series

[GIT,PULL] Second Round of Renesas ARM Based SoC Updates for v4.15

Message ID cover.1507623048.git.horms+renesas@verge.net.au
State New
Headers show
Series [GIT,PULL] Second Round of Renesas ARM Based SoC Updates for v4.15 | expand

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v4.15

Message

Simon Horman Oct. 10, 2017, 8:12 a.m. UTC 
Hi Olof, Hi Kevin, Hi Arnd,

Please consider these second round of Renesas ARM based SoC updates for v4.15.

This pull request is based on the previous round of
such requests, tagged as renesas-soc-for-v4.15,
which I have already sent a pull-request for.

This pull request fixes a bug introduced in renesas-soc-for-v4.15.


The following changes since commit 3fd45a136ff61bb54deab70fb2d534a85e40481f:

  ARM: shmobile: rcar-gen2: Make sure CNTVOFF is initialized on CA7/15 (2017-09-18 08:10:44 +0200)

are available in the git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v4.15

for you to fetch changes up to dc15ca962757ca72a4492b2e13be2eecc6dcd716:

  ARM: shmobile: rcar-gen2: fix non-SMP build (2017-10-06 11:35:34 +0200)

----------------------------------------------------------------
Second Round of Renesas ARM Based SoC Updates for v4.15

Fix to allow UP build of shmobile.

Arnd Bergmann says:

  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.

----------------------------------------------------------------
Arnd Bergmann (1):
      ARM: shmobile: rcar-gen2: fix non-SMP build

 arch/arm/mach-shmobile/headsmp-apmu.S | 2 ++
 1 file changed, 2 insertions(+)

Comments

Sergei Shtylyov Oct. 10, 2017, 9:25 a.m. UTC | #1 
Hello!

On 10/10/2017 11:12 AM, Simon Horman wrote:

> From: Arnd Bergmann <arnd@arndb.de>
> 
> 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")

    "Fixes:"?

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[...]

MBR, Sergei
Simon Horman Oct. 11, 2017, 7:42 a.m. UTC | #2 
On Tue, Oct 10, 2017 at 12:25:42PM +0300, Sergei Shtylyov wrote:
> Hello!
> 
> On 10/10/2017 11:12 AM, Simon Horman wrote:
> 
> >From: Arnd Bergmann <arnd@arndb.de>
> >
> >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")
> 
>    "Fixes:"?

Thanks, I will fix and repost.
Arnd Bergmann Oct. 19, 2017, 8:38 p.m. UTC | #3 
On Tue, Oct 10, 2017 at 10:12 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these second round of Renesas ARM based SoC updates for v4.15.
>
> This pull request is based on the previous round of
> such requests, tagged as renesas-soc-for-v4.15,
> which I have already sent a pull-request for.

Pulled into next/soc, thanks!

      Arnd