* [PATCH 1/7] arm64: dts: renesas: r8a7796: Add IPMMU device nodes
2017-11-01 10:34 [PATCH 0/7] arm64: dts: renesas: r8a7795: IPMMU upstream integration Simon Horman
@ 2017-11-01 10:34 ` Simon Horman
2017-11-07 9:54 ` Geert Uytterhoeven
2017-11-01 10:34 ` [PATCH 2/7] arm64: dts: renesas: r8a7796: Tie SYS-DMAC to IPMMU-DS0/1 Simon Horman
` (5 subsequent siblings)
6 siblings, 1 reply; 16+ messages in thread
From: Simon Horman @ 2017-11-01 10:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Add r8a7796 IPMMU nodes and keep all disabled by default.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
[simon: update names]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 89 ++++++++++++++++++++++++++++++++
1 file changed, 89 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index 8c94a313d9e1..cef1901736a8 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -357,6 +357,95 @@
<&a53_3>;
};
+ ipmmu_vi0: mmu at febd0000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xfebd0000 0 0x1000>; /* IPMMU-VI0 */
+ renesas,ipmmu-main = <&ipmmu_mm 9>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_vc0: mmu at fe6b0000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xfe6b0000 0 0x1000>; /* IPMMU-VC0 */
+ renesas,ipmmu-main = <&ipmmu_mm 8>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_pv0: mmu at fd800000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xfd800000 0 0x1000>; /* IPMMU-PV0 */
+ renesas,ipmmu-main = <&ipmmu_mm 5>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_pv1: mmu at fd950000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xfd950000 0 0x1000>; /* IPMMU-PV1 */
+ renesas,ipmmu-main = <&ipmmu_mm 6>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_ir: mmu at ff8b0000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xff8b0000 0 0x1000>; /* IPMMU-IR */
+ renesas,ipmmu-main = <&ipmmu_mm 3>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_hc: mmu at e6570000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xe6570000 0 0x1000>; /* IPMMU-HC */
+ renesas,ipmmu-main = <&ipmmu_mm 2>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_rt: mmu at ffc80000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xffc80000 0 0x1000>; /* IPMMU-RT */
+ renesas,ipmmu-main = <&ipmmu_mm 7>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_mp: mmu at ec670000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xec670000 0 0x1000>; /* IPMMU-MP */
+ renesas,ipmmu-main = <&ipmmu_mm 4>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_ds0: mmu at e6740000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xe6740000 0 0x1000>; /* IPMMU-DS0 */
+ renesas,ipmmu-main = <&ipmmu_mm 0>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_ds1: mmu at e7740000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xe7740000 0 0x1000>; /* IPMMU-DS1 */
+ renesas,ipmmu-main = <&ipmmu_mm 1>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_mm: mmu at e67b0000 {
+ compatible = "renesas,ipmmu-r8a7796";
+ reg = <0 0xe67b0000 0 0x1000>; /* IPMMU-MM */
+ interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
cpg: clock-controller at e6150000 {
compatible = "renesas,r8a7796-cpg-mssr";
reg = <0 0xe6150000 0 0x1000>;
--
2.11.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 1/7] arm64: dts: renesas: r8a7796: Add IPMMU device nodes
2017-11-01 10:34 ` [PATCH 1/7] arm64: dts: renesas: r8a7796: Add IPMMU device nodes Simon Horman
@ 2017-11-07 9:54 ` Geert Uytterhoeven
2017-11-10 11:36 ` Simon Horman
0 siblings, 1 reply; 16+ messages in thread
From: Geert Uytterhoeven @ 2017-11-07 9:54 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 1, 2017 at 11:34 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Add r8a7796 IPMMU nodes and keep all disabled by default.
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> [simon: update names]
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
My comments for r8a7795.dtsi about IPMMU-* comments and power-domains
properties are applicable here, too.
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
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH 1/7] arm64: dts: renesas: r8a7796: Add IPMMU device nodes
2017-11-07 9:54 ` Geert Uytterhoeven
@ 2017-11-10 11:36 ` Simon Horman
0 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2017-11-10 11:36 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 07, 2017 at 10:54:17AM +0100, Geert Uytterhoeven wrote:
> On Wed, Nov 1, 2017 at 11:34 AM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
> > From: Magnus Damm <damm+renesas@opensource.se>
> >
> > Add r8a7796 IPMMU nodes and keep all disabled by default.
> >
> > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> > [simon: update names]
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> My comments for r8a7795.dtsi about IPMMU-* comments and power-domains
> properties are applicable here, too.
Thanks, will fix.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 2/7] arm64: dts: renesas: r8a7796: Tie SYS-DMAC to IPMMU-DS0/1
2017-11-01 10:34 [PATCH 0/7] arm64: dts: renesas: r8a7795: IPMMU upstream integration Simon Horman
2017-11-01 10:34 ` [PATCH 1/7] arm64: dts: renesas: r8a7796: Add IPMMU device nodes Simon Horman
@ 2017-11-01 10:34 ` Simon Horman
2017-11-07 10:00 ` Geert Uytterhoeven
2017-11-01 10:34 ` [PATCH 3/7] arm64: dts: renesas: r8a7796: Tie Audio-DMAC to IPMMU-MP Simon Horman
` (4 subsequent siblings)
6 siblings, 1 reply; 16+ messages in thread
From: Simon Horman @ 2017-11-01 10:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Hook up r8a7796 DMAC nodes to the IPMMUs. In particular SYS-DMAC0
gets tied to IPMMU-DS0, and SYS-DMAC1 and SYS-DMAC2 get tied to IPMMU-DS1.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index cef1901736a8..de044c954638 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -1190,6 +1190,14 @@
resets = <&cpg 219>;
#dma-cells = <1>;
dma-channels = <16>;
+ iommus = <&ipmmu_ds0 0>, <&ipmmu_ds0 1>,
+ <&ipmmu_ds0 2>, <&ipmmu_ds0 3>,
+ <&ipmmu_ds0 4>, <&ipmmu_ds0 5>,
+ <&ipmmu_ds0 6>, <&ipmmu_ds0 7>,
+ <&ipmmu_ds0 8>, <&ipmmu_ds0 9>,
+ <&ipmmu_ds0 10>, <&ipmmu_ds0 11>,
+ <&ipmmu_ds0 12>, <&ipmmu_ds0 13>,
+ <&ipmmu_ds0 14>, <&ipmmu_ds0 15>;
};
dmac1: dma-controller at e7300000 {
@@ -1224,6 +1232,14 @@
resets = <&cpg 218>;
#dma-cells = <1>;
dma-channels = <16>;
+ iommus = <&ipmmu_ds1 0>, <&ipmmu_ds1 1>,
+ <&ipmmu_ds1 2>, <&ipmmu_ds1 3>,
+ <&ipmmu_ds1 4>, <&ipmmu_ds1 5>,
+ <&ipmmu_ds1 6>, <&ipmmu_ds1 7>,
+ <&ipmmu_ds1 8>, <&ipmmu_ds1 9>,
+ <&ipmmu_ds1 10>, <&ipmmu_ds1 11>,
+ <&ipmmu_ds1 12>, <&ipmmu_ds1 13>,
+ <&ipmmu_ds1 14>, <&ipmmu_ds1 15>;
};
dmac2: dma-controller at e7310000 {
@@ -1258,6 +1274,14 @@
resets = <&cpg 217>;
#dma-cells = <1>;
dma-channels = <16>;
+ iommus = <&ipmmu_ds1 16>, <&ipmmu_ds1 17>,
+ <&ipmmu_ds1 18>, <&ipmmu_ds1 19>,
+ <&ipmmu_ds1 20>, <&ipmmu_ds1 21>,
+ <&ipmmu_ds1 22>, <&ipmmu_ds1 23>,
+ <&ipmmu_ds1 24>, <&ipmmu_ds1 25>,
+ <&ipmmu_ds1 26>, <&ipmmu_ds1 27>,
+ <&ipmmu_ds1 28>, <&ipmmu_ds1 29>,
+ <&ipmmu_ds1 30>, <&ipmmu_ds1 31>;
};
audma0: dma-controller at ec700000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 2/7] arm64: dts: renesas: r8a7796: Tie SYS-DMAC to IPMMU-DS0/1
2017-11-01 10:34 ` [PATCH 2/7] arm64: dts: renesas: r8a7796: Tie SYS-DMAC to IPMMU-DS0/1 Simon Horman
@ 2017-11-07 10:00 ` Geert Uytterhoeven
0 siblings, 0 replies; 16+ messages in thread
From: Geert Uytterhoeven @ 2017-11-07 10:00 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 1, 2017 at 11:34 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Hook up r8a7796 DMAC nodes to the IPMMUs. In particular SYS-DMAC0
> gets tied to IPMMU-DS0, and SYS-DMAC1 and SYS-DMAC2 get tied to IPMMU-DS1.
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 3/7] arm64: dts: renesas: r8a7796: Tie Audio-DMAC to IPMMU-MP
2017-11-01 10:34 [PATCH 0/7] arm64: dts: renesas: r8a7795: IPMMU upstream integration Simon Horman
2017-11-01 10:34 ` [PATCH 1/7] arm64: dts: renesas: r8a7796: Add IPMMU device nodes Simon Horman
2017-11-01 10:34 ` [PATCH 2/7] arm64: dts: renesas: r8a7796: Tie SYS-DMAC to IPMMU-DS0/1 Simon Horman
@ 2017-11-01 10:34 ` Simon Horman
2017-11-07 10:01 ` Geert Uytterhoeven
2017-11-01 10:34 ` [PATCH 4/7] arm64: dts: renesas: r8a7796: Point FDP1 via FCPF to IPMMU-VI0 Simon Horman
` (3 subsequent siblings)
6 siblings, 1 reply; 16+ messages in thread
From: Simon Horman @ 2017-11-01 10:34 UTC (permalink / raw)
To: linux-arm-kernel
Hook up r8a7796 Audio-DMAC nodes to the IPMMU-MP.
Based on work for the r8a7795 by Magnus Damm.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index de044c954638..ce74a7ae47f4 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -1316,6 +1316,14 @@
resets = <&cpg 502>;
#dma-cells = <1>;
dma-channels = <16>;
+ iommus = <&ipmmu_mp 0>, <&ipmmu_mp 1>,
+ <&ipmmu_mp 2>, <&ipmmu_mp 3>,
+ <&ipmmu_mp 4>, <&ipmmu_mp 5>,
+ <&ipmmu_mp 6>, <&ipmmu_mp 7>,
+ <&ipmmu_mp 8>, <&ipmmu_mp 9>,
+ <&ipmmu_mp 10>, <&ipmmu_mp 11>,
+ <&ipmmu_mp 12>, <&ipmmu_mp 13>,
+ <&ipmmu_mp 14>, <&ipmmu_mp 15>;
};
audma1: dma-controller at ec720000 {
@@ -1350,6 +1358,14 @@
resets = <&cpg 501>;
#dma-cells = <1>;
dma-channels = <16>;
+ iommus = <&ipmmu_mp 16>, <&ipmmu_mp 17>,
+ <&ipmmu_mp 18>, <&ipmmu_mp 19>,
+ <&ipmmu_mp 20>, <&ipmmu_mp 21>,
+ <&ipmmu_mp 22>, <&ipmmu_mp 23>,
+ <&ipmmu_mp 24>, <&ipmmu_mp 25>,
+ <&ipmmu_mp 26>, <&ipmmu_mp 27>,
+ <&ipmmu_mp 28>, <&ipmmu_mp 29>,
+ <&ipmmu_mp 30>, <&ipmmu_mp 31>;
};
usb_dmac0: dma-controller at e65a0000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 3/7] arm64: dts: renesas: r8a7796: Tie Audio-DMAC to IPMMU-MP
2017-11-01 10:34 ` [PATCH 3/7] arm64: dts: renesas: r8a7796: Tie Audio-DMAC to IPMMU-MP Simon Horman
@ 2017-11-07 10:01 ` Geert Uytterhoeven
0 siblings, 0 replies; 16+ messages in thread
From: Geert Uytterhoeven @ 2017-11-07 10:01 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 1, 2017 at 11:34 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> Hook up r8a7796 Audio-DMAC nodes to the IPMMU-MP.
>
> Based on work for the r8a7795 by Magnus Damm.
>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 4/7] arm64: dts: renesas: r8a7796: Point FDP1 via FCPF to IPMMU-VI0
2017-11-01 10:34 [PATCH 0/7] arm64: dts: renesas: r8a7795: IPMMU upstream integration Simon Horman
` (2 preceding siblings ...)
2017-11-01 10:34 ` [PATCH 3/7] arm64: dts: renesas: r8a7796: Tie Audio-DMAC to IPMMU-MP Simon Horman
@ 2017-11-01 10:34 ` Simon Horman
2017-11-07 10:04 ` Geert Uytterhoeven
2017-11-01 10:34 ` [PATCH 5/7] arm64: dts: renesas: r8a7796: Point VSPI via FCPVI to IPMMU-VC0 Simon Horman
` (2 subsequent siblings)
6 siblings, 1 reply; 16+ messages in thread
From: Simon Horman @ 2017-11-01 10:34 UTC (permalink / raw)
To: linux-arm-kernel
Hook up the FCPF devices to allow use of FDP1 with IPMMU-VI0.
Based on work by Magnus Damm for the r8a7795.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index ce74a7ae47f4..d4c2e12daba7 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -1892,6 +1892,7 @@
clocks = <&cpg CPG_MOD 603>;
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
resets = <&cpg 603>;
+ iommus = <&ipmmu_vi0 8>;
};
vspd1: vsp at fea28000 {
@@ -1911,6 +1912,7 @@
clocks = <&cpg CPG_MOD 602>;
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
resets = <&cpg 602>;
+ iommus = <&ipmmu_vi0 9>;
};
vspd2: vsp at fea30000 {
@@ -1930,6 +1932,7 @@
clocks = <&cpg CPG_MOD 601>;
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
resets = <&cpg 601>;
+ iommus = <&ipmmu_vi0 10>;
};
hdmi0: hdmi at fead0000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 4/7] arm64: dts: renesas: r8a7796: Point FDP1 via FCPF to IPMMU-VI0
2017-11-01 10:34 ` [PATCH 4/7] arm64: dts: renesas: r8a7796: Point FDP1 via FCPF to IPMMU-VI0 Simon Horman
@ 2017-11-07 10:04 ` Geert Uytterhoeven
0 siblings, 0 replies; 16+ messages in thread
From: Geert Uytterhoeven @ 2017-11-07 10:04 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 1, 2017 at 11:34 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> Hook up the FCPF devices to allow use of FDP1 with IPMMU-VI0.
>
> Based on work by Magnus Damm for the r8a7795.
>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 5/7] arm64: dts: renesas: r8a7796: Point VSPI via FCPVI to IPMMU-VC0
2017-11-01 10:34 [PATCH 0/7] arm64: dts: renesas: r8a7795: IPMMU upstream integration Simon Horman
` (3 preceding siblings ...)
2017-11-01 10:34 ` [PATCH 4/7] arm64: dts: renesas: r8a7796: Point FDP1 via FCPF to IPMMU-VI0 Simon Horman
@ 2017-11-01 10:34 ` Simon Horman
2017-11-07 10:05 ` Geert Uytterhoeven
2017-11-01 10:34 ` [PATCH 6/7] arm64: dts: renesas: r8a7796: Connect Ethernet-AVB to IPMMU-DS0 Simon Horman
2017-11-01 10:34 ` [PATCH 7/7] arm64: dts: renesas: r8a7796: Enable IPMMU-DS0, DS1, MP, VI0, VC0 and MM Simon Horman
6 siblings, 1 reply; 16+ messages in thread
From: Simon Horman @ 2017-11-01 10:34 UTC (permalink / raw)
To: linux-arm-kernel
Hook up the FCPVI devices to allow use of VSPI with IPMMU-VC0.
Based on work for the r8a7795 by Magnus Damm.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index d4c2e12daba7..c14ce1c47487 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -1873,6 +1873,7 @@
clocks = <&cpg CPG_MOD 611>;
power-domains = <&sysc R8A7796_PD_A3VC>;
resets = <&cpg 611>;
+ iommus = <&ipmmu_vc0 19>;
};
vspd0: vsp at fea20000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 5/7] arm64: dts: renesas: r8a7796: Point VSPI via FCPVI to IPMMU-VC0
2017-11-01 10:34 ` [PATCH 5/7] arm64: dts: renesas: r8a7796: Point VSPI via FCPVI to IPMMU-VC0 Simon Horman
@ 2017-11-07 10:05 ` Geert Uytterhoeven
0 siblings, 0 replies; 16+ messages in thread
From: Geert Uytterhoeven @ 2017-11-07 10:05 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 1, 2017 at 11:34 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> Hook up the FCPVI devices to allow use of VSPI with IPMMU-VC0.
>
> Based on work for the r8a7795 by Magnus Damm.
>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 6/7] arm64: dts: renesas: r8a7796: Connect Ethernet-AVB to IPMMU-DS0
2017-11-01 10:34 [PATCH 0/7] arm64: dts: renesas: r8a7795: IPMMU upstream integration Simon Horman
` (4 preceding siblings ...)
2017-11-01 10:34 ` [PATCH 5/7] arm64: dts: renesas: r8a7796: Point VSPI via FCPVI to IPMMU-VC0 Simon Horman
@ 2017-11-01 10:34 ` Simon Horman
2017-11-07 10:06 ` Geert Uytterhoeven
2017-11-01 10:34 ` [PATCH 7/7] arm64: dts: renesas: r8a7796: Enable IPMMU-DS0, DS1, MP, VI0, VC0 and MM Simon Horman
6 siblings, 1 reply; 16+ messages in thread
From: Simon Horman @ 2017-11-01 10:34 UTC (permalink / raw)
To: linux-arm-kernel
Add IPMMU-DS0 to the Ethernet-AVB device node.
Based on work by Magnus Damm for the r8a7795.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index c14ce1c47487..78160b4a380c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -906,6 +906,7 @@
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
resets = <&cpg 812>;
phy-mode = "rgmii-txid";
+ iommus = <&ipmmu_ds0 16>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
--
2.11.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 6/7] arm64: dts: renesas: r8a7796: Connect Ethernet-AVB to IPMMU-DS0
2017-11-01 10:34 ` [PATCH 6/7] arm64: dts: renesas: r8a7796: Connect Ethernet-AVB to IPMMU-DS0 Simon Horman
@ 2017-11-07 10:06 ` Geert Uytterhoeven
0 siblings, 0 replies; 16+ messages in thread
From: Geert Uytterhoeven @ 2017-11-07 10:06 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 1, 2017 at 11:34 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> Add IPMMU-DS0 to the Ethernet-AVB device node.
>
> Based on work by Magnus Damm for the r8a7795.
>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 7/7] arm64: dts: renesas: r8a7796: Enable IPMMU-DS0, DS1, MP, VI0, VC0 and MM
2017-11-01 10:34 [PATCH 0/7] arm64: dts: renesas: r8a7795: IPMMU upstream integration Simon Horman
` (5 preceding siblings ...)
2017-11-01 10:34 ` [PATCH 6/7] arm64: dts: renesas: r8a7796: Connect Ethernet-AVB to IPMMU-DS0 Simon Horman
@ 2017-11-01 10:34 ` Simon Horman
2017-11-07 10:06 ` Geert Uytterhoeven
6 siblings, 1 reply; 16+ messages in thread
From: Simon Horman @ 2017-11-01 10:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Enable the r8a7795 device nodes for IPMMU-DS0, IPMMU-DS1, IPMMU-MP,
IPMMU-VI0, IPMMU-VC0 and the shared IPMMU-MM device.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
[simon: enable IPMMU-MP, VI0 and VC0]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index 78160b4a380c..f0800f501116 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -362,7 +362,6 @@
reg = <0 0xfebd0000 0 0x1000>; /* IPMMU-VI0 */
renesas,ipmmu-main = <&ipmmu_mm 9>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_vc0: mmu at fe6b0000 {
@@ -370,7 +369,6 @@
reg = <0 0xfe6b0000 0 0x1000>; /* IPMMU-VC0 */
renesas,ipmmu-main = <&ipmmu_mm 8>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_pv0: mmu at fd800000 {
@@ -418,7 +416,6 @@
reg = <0 0xec670000 0 0x1000>; /* IPMMU-MP */
renesas,ipmmu-main = <&ipmmu_mm 4>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_ds0: mmu at e6740000 {
@@ -426,7 +423,6 @@
reg = <0 0xe6740000 0 0x1000>; /* IPMMU-DS0 */
renesas,ipmmu-main = <&ipmmu_mm 0>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_ds1: mmu at e7740000 {
@@ -434,7 +430,6 @@
reg = <0 0xe7740000 0 0x1000>; /* IPMMU-DS1 */
renesas,ipmmu-main = <&ipmmu_mm 1>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_mm: mmu at e67b0000 {
@@ -443,7 +438,6 @@
interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
- status = "disabled";
};
cpg: clock-controller at e6150000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 7/7] arm64: dts: renesas: r8a7796: Enable IPMMU-DS0, DS1, MP, VI0, VC0 and MM
2017-11-01 10:34 ` [PATCH 7/7] arm64: dts: renesas: r8a7796: Enable IPMMU-DS0, DS1, MP, VI0, VC0 and MM Simon Horman
@ 2017-11-07 10:06 ` Geert Uytterhoeven
0 siblings, 0 replies; 16+ messages in thread
From: Geert Uytterhoeven @ 2017-11-07 10:06 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 1, 2017 at 11:34 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Enable the r8a7795 device nodes for IPMMU-DS0, IPMMU-DS1, IPMMU-MP,
> IPMMU-VI0, IPMMU-VC0 and the shared IPMMU-MM device.
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> [simon: enable IPMMU-MP, VI0 and VC0]
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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
^ permalink raw reply [flat|nested] 16+ messages in thread