[PATCH 00/03] Connect R-Car Gen3 Ethernet-AVB to IPMMU

[PATCH 00/03] Connect R-Car Gen3 Ethernet-AVB to IPMMU

[Magnus Damm]

Connect R-Car Gen3 Ethernet-AVB to IPMMU

[PATCH 01/03] arm64: dts: renesas: r8a77965: Connect R-Car M3-N AVB to IPMMU
[PATCH 02/03] arm64: dts: renesas: r8a77980: Connect R-Car V3H AVB to IPMMU
[PATCH 03/03] arm64: dts: renesas: r8a77990: Connect R-Car E3 AVB to IPMMU

For each SoC describe Ethernet-AVB to IPMMU hardware connection in the
Device Tree. This series affects R-Car M3-N, V3H and E3. Other members
of the R-Car Gen3 family such as H3, M3-W, V3M and D3 already includes
this information in their DT files.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

 Developed on top of renesas-devel-20181019-v4.19-rc8

 arch/arm64/boot/dts/renesas/r8a77965.dtsi |    1 +
 arch/arm64/boot/dts/renesas/r8a77980.dtsi |    1 +
 arch/arm64/boot/dts/renesas/r8a77990.dtsi |    1 +
 3 files changed, 3 insertions(+)

[PATCH 01/03] arm64: dts: renesas: r8a77965: Connect R-Car M3-N AVB to IPMMU

[Magnus Damm]

From: Magnus Damm <damm@opensource.se>

Hook up the R-Car M3-N AVB device to IPMMU-DS0 16 as described in
the data sheet.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 arch/arm64/boot/dts/renesas/r8a77965.dtsi |    1 +
 1 file changed, 1 insertion(+)

--- 0001/arch/arm64/boot/dts/renesas/r8a77965.dtsi
+++ work/arch/arm64/boot/dts/renesas/r8a77965.dtsi	2018-10-22 01:46:02.498689171 +0900
@@ -900,6 +900,7 @@
 			power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
 			resets = <&cpg 812>;
 			phy-mode = "rgmii";
+			iommus = <&ipmmu_ds0 16>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";

[PATCH 02/03] arm64: dts: renesas: r8a77980: Connect R-Car V3H AVB to IPMMU

[Magnus Damm]

From: Magnus Damm <damm@opensource.se>

Hook up the R-Car V3H AVB device to IPMMU-DS1 33 as described in
the data sheet.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 arch/arm64/boot/dts/renesas/r8a77980.dtsi |    1 +
 1 file changed, 1 insertion(+)

--- 0001/arch/arm64/boot/dts/renesas/r8a77980.dtsi
+++ work/arch/arm64/boot/dts/renesas/r8a77980.dtsi	2018-10-22 01:50:17.072036042 +0900
@@ -667,6 +667,7 @@
 			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
 			resets = <&cpg 812>;
 			phy-mode = "rgmii";
+			iommus = <&ipmmu_ds1 33>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";

[PATCH 03/03] arm64: dts: renesas: r8a77990: Connect R-Car E3 AVB to IPMMU

[Magnus Damm]

From: Magnus Damm <damm@opensource.se>

Hook up the R-Car E3 AVB device to IPMMU-DS0 16 as described in
the data sheet.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 arch/arm64/boot/dts/renesas/r8a77990.dtsi |    1 +
 1 file changed, 1 insertion(+)

--- 0001/arch/arm64/boot/dts/renesas/r8a77990.dtsi
+++ work/arch/arm64/boot/dts/renesas/r8a77990.dtsi	2018-10-22 01:48:50.488496607 +0900
@@ -604,6 +604,7 @@
 			power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
 			resets = <&cpg 812>;
 			phy-mode = "rgmii";
+			iommus = <&ipmmu_ds0 16>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";

Re: [PATCH 01/03] arm64: dts: renesas: r8a77965: Connect R-Car M3-N AVB to IPMMU

[Simon Horman]

On Mon, Oct 22, 2018 at 02:14:44AM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> Hook up the R-Car M3-N AVB device to IPMMU-DS0 16 as described in
> the data sheet.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>

Tested-by: Simon Horman <horms+renesas@verge.net.au>

I will apply this for v4.21.


> ---
> 
>  arch/arm64/boot/dts/renesas/r8a77965.dtsi |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- 0001/arch/arm64/boot/dts/renesas/r8a77965.dtsi
> +++ work/arch/arm64/boot/dts/renesas/r8a77965.dtsi	2018-10-22 01:46:02.498689171 +0900
> @@ -900,6 +900,7 @@
>  			power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
>  			resets = <&cpg 812>;
>  			phy-mode = "rgmii";
> +			iommus = <&ipmmu_ds0 16>;
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			status = "disabled";
> 

Re: [PATCH 03/03] arm64: dts: renesas: r8a77990: Connect R-Car E3 AVB to IPMMU

[Simon Horman]

On Mon, Oct 22, 2018 at 02:15:03AM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> Hook up the R-Car E3 AVB device to IPMMU-DS0 16 as described in
> the data sheet.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>

Tested-by: Simon Horman <horms+renesas@verge.net.au>

I will apply this for v4.21.

> ---
> 
>  arch/arm64/boot/dts/renesas/r8a77990.dtsi |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- 0001/arch/arm64/boot/dts/renesas/r8a77990.dtsi
> +++ work/arch/arm64/boot/dts/renesas/r8a77990.dtsi	2018-10-22 01:48:50.488496607 +0900
> @@ -604,6 +604,7 @@
>  			power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
>  			resets = <&cpg 812>;
>  			phy-mode = "rgmii";
> +			iommus = <&ipmmu_ds0 16>;
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			status = "disabled";
> 

Re: [PATCH 02/03] arm64: dts: renesas: r8a77980: Connect R-Car V3H AVB to IPMMU

[Simon Horman]

On Mon, Oct 22, 2018 at 02:14:54AM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> Hook up the R-Car V3H AVB device to IPMMU-DS1 33 as described in
> the data sheet.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>

Thanks Magnus,

applied for v4.21.

Re: [PATCH 00/03] Connect R-Car Gen3 Ethernet-AVB to IPMMU

[Simon Horman]

On Mon, Oct 22, 2018 at 02:14:34AM +0900, Magnus Damm wrote:
> Connect R-Car Gen3 Ethernet-AVB to IPMMU
> 
> [PATCH 01/03] arm64: dts: renesas: r8a77965: Connect R-Car M3-N AVB to IPMMU
> [PATCH 02/03] arm64: dts: renesas: r8a77980: Connect R-Car V3H AVB to IPMMU
> [PATCH 03/03] arm64: dts: renesas: r8a77990: Connect R-Car E3 AVB to IPMMU
> 
> For each SoC describe Ethernet-AVB to IPMMU hardware connection in the
> Device Tree. This series affects R-Car M3-N, V3H and E3. Other members
> of the R-Car Gen3 family such as H3, M3-W, V3M and D3 already includes
> this information in their DT files.
> 
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>

Hi,

I have already queued-up these patches but I noticed that
they do the same thing to different SoCs and recently the ARM-SoC
maintainers have asked us to consolidate such patches. With that in mind
I am considering squashing the three patches that comprise this series into
one. Are there any objections?

Re: [PATCH 00/03] Connect R-Car Gen3 Ethernet-AVB to IPMMU

[Simon Horman]

On Wed, Nov 07, 2018 at 12:21:16PM +0100, Simon Horman wrote:
> On Mon, Oct 22, 2018 at 02:14:34AM +0900, Magnus Damm wrote:
> > Connect R-Car Gen3 Ethernet-AVB to IPMMU
> > 
> > [PATCH 01/03] arm64: dts: renesas: r8a77965: Connect R-Car M3-N AVB to IPMMU
> > [PATCH 02/03] arm64: dts: renesas: r8a77980: Connect R-Car V3H AVB to IPMMU
> > [PATCH 03/03] arm64: dts: renesas: r8a77990: Connect R-Car E3 AVB to IPMMU
> > 
> > For each SoC describe Ethernet-AVB to IPMMU hardware connection in the
> > Device Tree. This series affects R-Car M3-N, V3H and E3. Other members
> > of the R-Car Gen3 family such as H3, M3-W, V3M and D3 already includes
> > this information in their DT files.
> > 
> > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> 
> Hi,
> 
> I have already queued-up these patches but I noticed that
> they do the same thing to different SoCs and recently the ARM-SoC
> maintainers have asked us to consolidate such patches. With that in mind
> I am considering squashing the three patches that comprise this series into
> one. Are there any objections?

I have now gone ahead and done so. The result is as follows:

From: Magnus Damm <damm@opensource.se>
Subject: [PATCH] ARM: dts: r8a7740, emev2, sh73a0: Include SoC name in DTSI

Update the R-Mobile A1 (r8a7740), Emma Mobile EV2 (emev2) and
SH-Mobile AG5 (sh72a0) DTSI to include product name.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
[simon: squashed similar patches]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/emev2.dtsi   | 2 +-
 arch/arm/boot/dts/r8a7740.dtsi | 2 +-
 arch/arm/boot/dts/sh73a0.dtsi  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi
index 373ea8720769..67d86012a85c 100644
--- a/arch/arm/boot/dts/emev2.dtsi
+++ b/arch/arm/boot/dts/emev2.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Device Tree Source for the EMEV2 SoC
+ * Device Tree Source for the Emma Mobile EV2 SoC
  *
  * Copyright (C) 2012 Renesas Solutions Corp.
  */
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 383cba68dbba..12ffe73bf2bc 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Device Tree Source for the r8a7740 SoC
+ * Device Tree Source for the R-Mobile A1 (R8A77400) SoC
  *
  * Copyright (C) 2012 Renesas Solutions Corp.
  */
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index e8f0a07c4564..33836990b102 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Device Tree Source for the SH73A0 SoC
+ * Device Tree Source for the SH-Mobile AG5 (R8A73A00/SH73A0) SoC
  *
  * Copyright (C) 2012 Renesas Solutions Corp.
  */
-- 
2.11.0

Re: [PATCH 00/03] Connect R-Car Gen3 Ethernet-AVB to IPMMU

[Geert Uytterhoeven]

Hi Simon,

On Tue, Nov 13, 2018 at 3:31 PM Simon Horman <horms@verge.net.au> wrote:
> On Wed, Nov 07, 2018 at 12:21:16PM +0100, Simon Horman wrote:
> > On Mon, Oct 22, 2018 at 02:14:34AM +0900, Magnus Damm wrote:
> > > Connect R-Car Gen3 Ethernet-AVB to IPMMU
> > >
> > > [PATCH 01/03] arm64: dts: renesas: r8a77965: Connect R-Car M3-N AVB to IPMMU
> > > [PATCH 02/03] arm64: dts: renesas: r8a77980: Connect R-Car V3H AVB to IPMMU
> > > [PATCH 03/03] arm64: dts: renesas: r8a77990: Connect R-Car E3 AVB to IPMMU
> > >
> > > For each SoC describe Ethernet-AVB to IPMMU hardware connection in the
> > > Device Tree. This series affects R-Car M3-N, V3H and E3. Other members
> > > of the R-Car Gen3 family such as H3, M3-W, V3M and D3 already includes
> > > this information in their DT files.
> > >
> > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> >
> > Hi,
> >
> > I have already queued-up these patches but I noticed that
> > they do the same thing to different SoCs and recently the ARM-SoC
> > maintainers have asked us to consolidate such patches. With that in mind
> > I am considering squashing the three patches that comprise this series into
> > one. Are there any objections?
>
> I have now gone ahead and done so. The result is as follows:
>
> From: Magnus Damm <damm@opensource.se>
> Subject: [PATCH] ARM: dts: r8a7740, emev2, sh73a0: Include SoC name in DTSI
>
> Update the R-Mobile A1 (r8a7740), Emma Mobile EV2 (emev2) and
> SH-Mobile AG5 (sh72a0) DTSI to include product name.
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> [simon: squashed similar patches]
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Wrong email thread?

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

Re: [PATCH 00/03] Connect R-Car Gen3 Ethernet-AVB to IPMMU

[Simon Horman]

On Tue, Nov 13, 2018 at 04:20:23PM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Tue, Nov 13, 2018 at 3:31 PM Simon Horman <horms@verge.net.au> wrote:
> > On Wed, Nov 07, 2018 at 12:21:16PM +0100, Simon Horman wrote:
> > > On Mon, Oct 22, 2018 at 02:14:34AM +0900, Magnus Damm wrote:
> > > > Connect R-Car Gen3 Ethernet-AVB to IPMMU
> > > >
> > > > [PATCH 01/03] arm64: dts: renesas: r8a77965: Connect R-Car M3-N AVB to IPMMU
> > > > [PATCH 02/03] arm64: dts: renesas: r8a77980: Connect R-Car V3H AVB to IPMMU
> > > > [PATCH 03/03] arm64: dts: renesas: r8a77990: Connect R-Car E3 AVB to IPMMU
> > > >
> > > > For each SoC describe Ethernet-AVB to IPMMU hardware connection in the
> > > > Device Tree. This series affects R-Car M3-N, V3H and E3. Other members
> > > > of the R-Car Gen3 family such as H3, M3-W, V3M and D3 already includes
> > > > this information in their DT files.
> > > >
> > > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> > >
> > > Hi,
> > >
> > > I have already queued-up these patches but I noticed that
> > > they do the same thing to different SoCs and recently the ARM-SoC
> > > maintainers have asked us to consolidate such patches. With that in mind
> > > I am considering squashing the three patches that comprise this series into
> > > one. Are there any objections?
> >
> > I have now gone ahead and done so. The result is as follows:
> >
> > From: Magnus Damm <damm@opensource.se>
> > Subject: [PATCH] ARM: dts: r8a7740, emev2, sh73a0: Include SoC name in DTSI
> >
> > Update the R-Mobile A1 (r8a7740), Emma Mobile EV2 (emev2) and
> > SH-Mobile AG5 (sh72a0) DTSI to include product name.
> >
> > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> > [simon: squashed similar patches]
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> 
> Wrong email thread?

Yes, oops.