[GIT PULL] Third Round of Renesas ARM Based Soc Updates for v3.19

[GIT PULL] Third Round of Renesas ARM Based Soc Updates for v3.19

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these third round of Renesas ARM based soc updates for v3.19.

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

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

Please note that "ARM: shmobile: always build rcar setup for armv7"
corrects a build failure in allmodconfig caused by "ARM: shmobile:
rcar-gen2: Add CA7 arch_timer initialization for r8a7794" which
is included in the first round of Renesas ARM Based SoC Soc Updates for
v3.19, tagged as renesas-soc2-for-v3.19, which I have previously sent
a pull-request for.

To be clear, this pull request is based on renesas-soc2-for-v3.19 which
is in turn based on renesas-soc2-for-v3.19.


The following changes since commit 950a3f0e7dd32c372c9957d5c050b08de7ec9e56:

  ARM: shmobile: Enable PCI domains for R-Car Gen2 devices (2014-11-05 14:50:17 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc3-for-v3.19

for you to fetch changes up to e3d163329753b3b473f40c9be71561ed8eb98aea:

  ARM: shmobile: always build rcar setup for armv7 (2014-11-12 18:14:42 +0900)

----------------------------------------------------------------
Third Round of Renesas ARM Based Soc Updates for v3.19

* Always build rcar setup for armv7
  - Fixes allmodconfig build fauilre caused by
    "ARM: shmobile: always build rcar setup for armv7"
* Add restart callback to sh73a0

----------------------------------------------------------------
Arnd Bergmann (1):
      ARM: shmobile: always build rcar setup for armv7

Geert Uytterhoeven (1):
      ARM: shmobile: sh73a0: Add restart callback

 arch/arm/mach-shmobile/Makefile       | 1 +
 arch/arm/mach-shmobile/setup-sh73a0.c | 8 ++++++++
 2 files changed, 9 insertions(+)

[PATCH 1/2] ARM: shmobile: sh73a0: Add restart callback

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@glider.be>

Port the sh73a0 restart handling from the kzm9g-legacy board code to the
generic sh73a0 code.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/setup-sh73a0.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index b7bd8e5..3447ca7 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -775,6 +775,13 @@ void __init sh73a0_add_standard_devices_dt(void)
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
+#define RESCNT2 IOMEM(0xe6188020)
+static void sh73a0_restart(enum reboot_mode mode, const char *cmd)
+{
+	/* Do soft power on reset */
+	writel((1 << 31), RESCNT2);
+}
+
 static const char *sh73a0_boards_compat_dt[] __initdata = {
 	"renesas,sh73a0",
 	NULL,
@@ -786,6 +793,7 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
 	.init_early	= sh73a0_init_delay,
 	.init_machine	= sh73a0_add_standard_devices_dt,
 	.init_late	= shmobile_init_late,
+	.restart	= sh73a0_restart,
 	.dt_compat	= sh73a0_boards_compat_dt,
 MACHINE_END
 #endif /* CONFIG_USE_OF */
-- 
2.1.1

[PATCH 2/2] ARM: shmobile: always build rcar setup for armv7

[Simon Horman]

From: Arnd Bergmann <arnd@arndb.de>

In a combined ARMv6/v7 kernel, the setup-rcar-gen2.c cannot
currently be compiled correctly because it uses the isb
instruction that is not available on ARMv6. Adding the
-march=armv7-a flag lets the compiler know that it is safe
to build this file for ARMv7.

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>
---
 arch/arm/mach-shmobile/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index e20f278..71e68ca 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -36,6 +36,7 @@ cpu-y				:= platsmp.o headsmp.o
 
 # Shared SoC family objects
 obj-$(CONFIG_ARCH_RCAR_GEN2)	+= setup-rcar-gen2.o platsmp-apmu.o $(cpu-y)
+CFLAGS_setup-rcar-gen2.o	+= -march=armv7-a
 
 # SMP objects
 smp-y				:= $(cpu-y)
-- 
2.1.1

[GIT PULL] Third Round of Renesas ARM Based Soc Updates for v3.19

[Sergei Shtylyov]

Hello.

On 11/13/2014 04:20 AM, Simon Horman wrote:

> Hi Olof, Hi Kevin, Hi Arnd,

> Please consider these third round of Renesas ARM based soc updates for v3.19.

> This pull request is based on the previous round of
> such requests, tagged as renesas-soc2-for-v3.19,
> which I have already sent a pull-request for.

> This pull request is based on the previous round of
> such requests, tagged as renesas-soc2-for-v3.19,
> which I have already sent a pull-request for.

    OK, but we've got it the first time. :-)

> Please note that "ARM: shmobile: always build rcar setup for armv7"
> corrects a build failure in allmodconfig caused by "ARM: shmobile:
> rcar-gen2: Add CA7 arch_timer initialization for r8a7794" which
> is included in the first round of Renesas ARM Based SoC Soc Updates for
> v3.19, tagged as renesas-soc2-for-v3.19, which I have previously sent
> a pull-request for.

    This is a third time you're repeating that. :-)

> To be clear, this pull request is based on renesas-soc2-for-v3.19 which
> is in turn based on renesas-soc2-for-v3.19.

    Based on itself? :-)

> The following changes since commit 950a3f0e7dd32c372c9957d5c050b08de7ec9e56:

>    ARM: shmobile: Enable PCI domains for R-Car Gen2 devices (2014-11-05 14:50:17 +0900)

> are available in the git repository at:

>    git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc3-for-v3.19

> for you to fetch changes up to e3d163329753b3b473f40c9be71561ed8eb98aea:

>    ARM: shmobile: always build rcar setup for armv7 (2014-11-12 18:14:42 +0900)

> ----------------------------------------------------------------
> Third Round of Renesas ARM Based Soc Updates for v3.19

> * Always build rcar setup for armv7
>    - Fixes allmodconfig build fauilre caused by

    Failure.

>      "ARM: shmobile: always build rcar setup for armv7"

    Caused by itself? :-)

> * Add restart callback to sh73a0

> ----------------------------------------------------------------
> Arnd Bergmann (1):
>        ARM: shmobile: always build rcar setup for armv7

> Geert Uytterhoeven (1):
>        ARM: shmobile: sh73a0: Add restart callback

>   arch/arm/mach-shmobile/Makefile       | 1 +
>   arch/arm/mach-shmobile/setup-sh73a0.c | 8 ++++++++
>   2 files changed, 9 insertions(+)

WBR, Sergei

[GIT PULL] Third Round of Renesas ARM Based Soc Updates for v3.19

[Simon Horman]

On Thu, Nov 13, 2014 at 09:50:22PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 11/13/2014 04:20 AM, Simon Horman wrote:
> 
> >Hi Olof, Hi Kevin, Hi Arnd,
> 
> >Please consider these third round of Renesas ARM based soc updates for v3.19.
> 
> >This pull request is based on the previous round of
> >such requests, tagged as renesas-soc2-for-v3.19,
> >which I have already sent a pull-request for.
> 
> >This pull request is based on the previous round of
> >such requests, tagged as renesas-soc2-for-v3.19,
> >which I have already sent a pull-request for.
> 
>    OK, but we've got it the first time. :-)

Sorry, that was an editing artifact.

> >Please note that "ARM: shmobile: always build rcar setup for armv7"
> >corrects a build failure in allmodconfig caused by "ARM: shmobile:
> >rcar-gen2: Add CA7 arch_timer initialization for r8a7794" which
> >is included in the first round of Renesas ARM Based SoC Soc Updates for
> >v3.19, tagged as renesas-soc2-for-v3.19, which I have previously sent
> >a pull-request for.
> 
>    This is a third time you're repeating that. :-)

I wanted to make sure it was clear.
Actually, I had more text which I deleted for fear of being too repetitive :)

> >To be clear, this pull request is based on renesas-soc2-for-v3.19 which
> >is in turn based on renesas-soc2-for-v3.19.
> 
>    Based on itself? :-)

The second instance of renesas-soc2-for-v3.19 should have been
renesas-soc-for-v3.19..

> 
> >The following changes since commit 950a3f0e7dd32c372c9957d5c050b08de7ec9e56:
> 
> >   ARM: shmobile: Enable PCI domains for R-Car Gen2 devices (2014-11-05 14:50:17 +0900)
> 
> >are available in the git repository at:
> 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc3-for-v3.19
> 
> >for you to fetch changes up to e3d163329753b3b473f40c9be71561ed8eb98aea:
> 
> >   ARM: shmobile: always build rcar setup for armv7 (2014-11-12 18:14:42 +0900)
> 
> >----------------------------------------------------------------
> >Third Round of Renesas ARM Based Soc Updates for v3.19
> 
> >* Always build rcar setup for armv7
> >   - Fixes allmodconfig build fauilre caused by
> 
>    Failure.
> 
> >     "ARM: shmobile: always build rcar setup for armv7"
> 
>    Caused by itself? :-)

Sorry about that, it is caused by "ARM: shmobile: rcar-gen2: Add CA7
arch_timer initialization for r8a7794".


> 
> >* Add restart callback to sh73a0
> 
> >----------------------------------------------------------------
> >Arnd Bergmann (1):
> >       ARM: shmobile: always build rcar setup for armv7
> 
> >Geert Uytterhoeven (1):
> >       ARM: shmobile: sh73a0: Add restart callback
> 
> >  arch/arm/mach-shmobile/Makefile       | 1 +
> >  arch/arm/mach-shmobile/setup-sh73a0.c | 8 ++++++++
> >  2 files changed, 9 insertions(+)
> 
> WBR, Sergei
> 

[GIT PULL] Third Round of Renesas ARM Based Soc Updates for v3.19

[Arnd Bergmann]

On Thursday 13 November 2014, Simon Horman wrote:
> ----------------------------------------------------------------
> Third Round of Renesas ARM Based Soc Updates for v3.19
> 
> * Always build rcar setup for armv7
>   - Fixes allmodconfig build fauilre caused by
>     "ARM: shmobile: always build rcar setup for armv7"
> * Add restart callback to sh73a0

Pulled into next/soc, thanks!

> ----------------------------------------------------------------
> Arnd Bergmann (1):
>       ARM: shmobile: always build rcar setup for armv7
> 
> Geert Uytterhoeven (1):
>       ARM: shmobile: sh73a0: Add restart callback

I'm not too happy about the restart handler here: 

+#define RESCNT2 IOMEM(0xe6188020)
+static void sh73a0_restart(enum reboot_mode mode, const char *cmd)
+{
+       /* Do soft power on reset */
+       writel((1 << 31), RESCNT2);
+}

I see that you have the same thing in other SoCs, but I'd really want to
see this done properly at some point and likely won't take future patches
doing the same thing.

Please have a look@drivers/power/restart for how other platforms do
this. You probably need to add a device node for whatever IP block
holds the reset register and then have a driver. What exactly this
driver should look like depends of course on what other registers are
part of this block.

	Arnd

[GIT PULL] Third Round of Renesas ARM Based Soc Updates for v3.19

[Simon Horman]

[ CC Geert ]

On Wed, Nov 19, 2014 at 10:16:27PM +0100, Arnd Bergmann wrote:
> On Thursday 13 November 2014, Simon Horman wrote:
> > ----------------------------------------------------------------
> > Third Round of Renesas ARM Based Soc Updates for v3.19
> > 
> > * Always build rcar setup for armv7
> >   - Fixes allmodconfig build fauilre caused by
> >     "ARM: shmobile: always build rcar setup for armv7"
> > * Add restart callback to sh73a0
> 
> Pulled into next/soc, thanks!
> 
> > ----------------------------------------------------------------
> > Arnd Bergmann (1):
> >       ARM: shmobile: always build rcar setup for armv7
> > 
> > Geert Uytterhoeven (1):
> >       ARM: shmobile: sh73a0: Add restart callback
> 
> I'm not too happy about the restart handler here: 
> 
> +#define RESCNT2 IOMEM(0xe6188020)
> +static void sh73a0_restart(enum reboot_mode mode, const char *cmd)
> +{
> +       /* Do soft power on reset */
> +       writel((1 << 31), RESCNT2);
> +}
> 
> I see that you have the same thing in other SoCs, but I'd really want to
> see this done properly at some point and likely won't take future patches
> doing the same thing.
> 
> Please have a look at drivers/power/restart for how other platforms do
> this. You probably need to add a device node for whatever IP block
> holds the reset register and then have a driver. What exactly this
> driver should look like depends of course on what other registers are
> part of this block.

Hi Arnd,

thanks for your feedback and likewise for the kzm9g.
I will follow this up.

[GIT PULL] Third Round of Renesas ARM Based Soc Updates for v3.19

[Geert Uytterhoeven]

Hi Arnd,

On Wed, Nov 19, 2014 at 10:16 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>> Geert Uytterhoeven (1):
>>       ARM: shmobile: sh73a0: Add restart callback
>
> I'm not too happy about the restart handler here:
>
> +#define RESCNT2 IOMEM(0xe6188020)
> +static void sh73a0_restart(enum reboot_mode mode, const char *cmd)
> +{
> +       /* Do soft power on reset */
> +       writel((1 << 31), RESCNT2);
> +}
>
> I see that you have the same thing in other SoCs, but I'd really want to
> see this done properly at some point and likely won't take future patches
> doing the same thing.

This is basically just moving/copying code from a board file to an SoC
file.

> Please have a look at drivers/power/restart for how other platforms do
> this. You probably need to add a device node for whatever IP block
> holds the reset register and then have a driver. What exactly this
> driver should look like depends of course on what other registers are
> part of this block.

I agree. Thanks for reminding us.

The IP block is the system-controller, which is also used for PM domain
control. So I'll take care of it.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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

[GIT PULL] Third Round of Renesas ARM Based Soc Updates for v3.19

[Arnd Bergmann]

On Thursday 20 November 2014 08:56:10 Geert Uytterhoeven wrote:
> > Please have a look at drivers/power/restart for how other platforms do
> > this. You probably need to add a device node for whatever IP block
> > holds the reset register and then have a driver. What exactly this
> > driver should look like depends of course on what other registers are
> > part of this block.
> 
> I agree. Thanks for reminding us.
> 
> The IP block is the system-controller, which is also used for PM domain
> control. So I'll take care of it.

Is it just the pm-domain driver and the system reset that needs to 
access this block? If yes, then the best option would be to register
the reset handler from the pm-domain driver, otherwise I think you
should have a syscon device node that gets shared between all drivers
using this device.

	Arnd

[GIT PULL] Third Round of Renesas ARM Based Soc Updates for v3.19

[Geert Uytterhoeven]

Hi Arnd,

On Thu, Nov 20, 2014 at 10:04 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Thursday 20 November 2014 08:56:10 Geert Uytterhoeven wrote:
>> > Please have a look at drivers/power/restart for how other platforms do
>> > this. You probably need to add a device node for whatever IP block
>> > holds the reset register and then have a driver. What exactly this
>> > driver should look like depends of course on what other registers are
>> > part of this block.
>>
>> I agree. Thanks for reminding us.
>>
>> The IP block is the system-controller, which is also used for PM domain
>> control. So I'll take care of it.
>
> Is it just the pm-domain driver and the system reset that needs to
> access this block? If yes, then the best option would be to register
> the reset handler from the pm-domain driver, otherwise I think you
> should have a syscon device node that gets shared between all drivers
> using this device.

Just PM domains, reset, and wake-up factors.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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