* [PATCH v5 00/15] arm64: dts: renesas: r8a7795: IPMMU upstream integration
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: linux-arm-kernel, Magnus Damm, Simon Horman
This series adds DT nodes for IPMMU instances on r8a7795 together with
connections to various r8a7795 on-chip devices such as Audio-DMAC, SYS-DMAC,
Ethernet-AVB, SATA and a bunch of multimedia devices that make use of FCP.
With these patches applied a white list enabled IPMMU driver may be used
to check silicon revision and then enable IPMMU in the known working cases.
The recommended test stack for this patchset is a merge of
* The iommu/next branch of the vfio tree
* renesas-devel-20171110-v4.14-rc8 tag of the renesas tree
The final two patches in the series enable IPMMU support for all IPMMU
instances on r8a7795 that are used by IPMMU devices listed above with one
exception. The exception is the SATA device connected to IPMMU-HC which
still is disabled pending IPMMU USB integration support. I expect IPMMU USB
integration to be handled as a second step once this series is agreed on.
The DT binding for r8a7795 has since long been included in mainline and
this series implements support following such format:
d4e42e7 iommu/ipmmu-vmsa: Add r8a7795 DT binding
Changes since V4:
- Correct ES1.x override for ipmmu_vc0
- Add ES1.x override for ipmmu_vc1
- Drop mostly redundant comments from nodes
- Add power domains
Changes since V3:
- Rework to support ES2.0
- Other minor changes as noted in per-patch changelogs
Changes since V2:
- Added the iommus property before power domains - thanks Geert!
- Added reviewed-by to patch 2 and 3 from Laurent - thanks!
- Re-added Ethernet and FCPVD patches (They were present in V1 but not V2)
- Added remaining FCP devices such as FCPF, FCPVB and FCPVI
- Added SATA device
- Added final patch to enable various IPMMU devices in the DTS file
Since the DT binding has been merged quite some time ago and the interface
seems stable enough I see no reason not to queue these up for upstream merge.
This is a minor rework of work by Magnus Damm.
Based on renesas-devel-20171110-v4.14-rc8
Magnus Damm (15):
arm64: dts: renesas: r8a7795: Add IPMMU device nodes
arm64: dts: renesas: r8a7795-es1: Add IPMMU device nodes
arm64: dts: renesas: r8a7795: Tie SYS-DMAC to IPMMU-DS0/1
arm64: dts: renesas: r8a7795: Tie Audio-DMAC to IPMMU-MP0/1
arm64: dts: renesas: r8a7795: Point DU/VSPD via FCPVD to IPMMU-VI0/1
arm64: dts: renesas: r8a7795-es1: Point DU/VSPD via FCPVD to IPMMU-VI0
arm64: dts: renesas: r8a7795: Point FDP1 via FCPF to IPMMU-VP0/1
arm64: dts: renesas: r8a7795-es1: Point FDP1 via FCPF to IPMMU-VP0
arm64: dts: renesas: r8a7795: Point VSPBC/VSPBD via FCPVB to
IPMMU-VP0/1
arm64: dts: renesas: r8a7795: Point VSPI via FCPVI to IPMMU-VP0/1
arm64: dts: renesas: r8a7795-es1: Point VSPI via FCPVI to IPMMU-VP
arm64: dts: renesas: r8a7795: Connect Ethernet-AVB to IPMMU-DS0
arm64: dts: renesas: r8a7795: Connect SATA to IPMMU-HC
arm64: dts: renesas: r8a7795: Enable IPMMU-VI0, VP1, DS0, DS1 and MM
arm64: dts: renesas: r8a7795-es1: Enable IPMMU-MP1
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 81 ++++++++++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 191 +++++++++++++++++++++++++++
2 files changed, 272 insertions(+)
--
2.11.0
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v5 00/15] arm64: dts: renesas: r8a7795: IPMMU upstream integration
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
This series adds DT nodes for IPMMU instances on r8a7795 together with
connections to various r8a7795 on-chip devices such as Audio-DMAC, SYS-DMAC,
Ethernet-AVB, SATA and a bunch of multimedia devices that make use of FCP.
With these patches applied a white list enabled IPMMU driver may be used
to check silicon revision and then enable IPMMU in the known working cases.
The recommended test stack for this patchset is a merge of
* The iommu/next branch of the vfio tree
* renesas-devel-20171110-v4.14-rc8 tag of the renesas tree
The final two patches in the series enable IPMMU support for all IPMMU
instances on r8a7795 that are used by IPMMU devices listed above with one
exception. The exception is the SATA device connected to IPMMU-HC which
still is disabled pending IPMMU USB integration support. I expect IPMMU USB
integration to be handled as a second step once this series is agreed on.
The DT binding for r8a7795 has since long been included in mainline and
this series implements support following such format:
d4e42e7 iommu/ipmmu-vmsa: Add r8a7795 DT binding
Changes since V4:
- Correct ES1.x override for ipmmu_vc0
- Add ES1.x override for ipmmu_vc1
- Drop mostly redundant comments from nodes
- Add power domains
Changes since V3:
- Rework to support ES2.0
- Other minor changes as noted in per-patch changelogs
Changes since V2:
- Added the iommus property before power domains - thanks Geert!
- Added reviewed-by to patch 2 and 3 from Laurent - thanks!
- Re-added Ethernet and FCPVD patches (They were present in V1 but not V2)
- Added remaining FCP devices such as FCPF, FCPVB and FCPVI
- Added SATA device
- Added final patch to enable various IPMMU devices in the DTS file
Since the DT binding has been merged quite some time ago and the interface
seems stable enough I see no reason not to queue these up for upstream merge.
This is a minor rework of work by Magnus Damm.
Based on renesas-devel-20171110-v4.14-rc8
Magnus Damm (15):
arm64: dts: renesas: r8a7795: Add IPMMU device nodes
arm64: dts: renesas: r8a7795-es1: Add IPMMU device nodes
arm64: dts: renesas: r8a7795: Tie SYS-DMAC to IPMMU-DS0/1
arm64: dts: renesas: r8a7795: Tie Audio-DMAC to IPMMU-MP0/1
arm64: dts: renesas: r8a7795: Point DU/VSPD via FCPVD to IPMMU-VI0/1
arm64: dts: renesas: r8a7795-es1: Point DU/VSPD via FCPVD to IPMMU-VI0
arm64: dts: renesas: r8a7795: Point FDP1 via FCPF to IPMMU-VP0/1
arm64: dts: renesas: r8a7795-es1: Point FDP1 via FCPF to IPMMU-VP0
arm64: dts: renesas: r8a7795: Point VSPBC/VSPBD via FCPVB to
IPMMU-VP0/1
arm64: dts: renesas: r8a7795: Point VSPI via FCPVI to IPMMU-VP0/1
arm64: dts: renesas: r8a7795-es1: Point VSPI via FCPVI to IPMMU-VP
arm64: dts: renesas: r8a7795: Connect Ethernet-AVB to IPMMU-DS0
arm64: dts: renesas: r8a7795: Connect SATA to IPMMU-HC
arm64: dts: renesas: r8a7795: Enable IPMMU-VI0, VP1, DS0, DS1 and MM
arm64: dts: renesas: r8a7795-es1: Enable IPMMU-MP1
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 81 ++++++++++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 191 +++++++++++++++++++++++++++
2 files changed, 272 insertions(+)
--
2.11.0
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v5 01/15] arm64: dts: renesas: r8a7795: Add IPMMU device nodes
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Add r8a7795 IPMMU nodes and keep all disabled by default.
This includes all IPMMU devices for r8a7795 ES2.0. Those
not present in r8a7795 ES1.x are removed from the DT for those
SoCs using delete-node. A follow-up patch will add IPMMU devices
to ES1.x which are not also present in ES2.0.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
v5 [Simon Horman]
* Correct ES1.x override for ipmmu_vc0
* Add ES1.x override for ipmmu_vc1
* Drop mostly redundant comments from nodes
* Add power domains
* Consistently mark all nodes as disabled
v4 [Simon Horman]
* Add IPMMU-VI1, IPMMU-VP1 IPMMU-PV2 and IPMMU-PV3
* Rename IPMMU-VP as IPMMU-VP0 and IPMMU-VI as IPMMU-VI0
as per recent datasheet naming
* Do not add IPMMU-MP1 or IPMMU-SY,
these will be added to ES1.x by follow-up patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 25 +++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 145 +++++++++++++++++++++++++++
2 files changed, 170 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 655dd30639c5..246323eacb56 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -21,6 +21,11 @@
status = "disabled";
};
+ /delete-node/ mmu@febe0000;
+ /delete-node/ mmu@fe980000;
+ /delete-node/ mmu@fd960000;
+ /delete-node/ mmu@fd970000;
+
/delete-node/ usb-phy@ee0e0200;
/delete-node/ usb@ee0e0100;
/delete-node/ usb@ee0e0000;
@@ -86,6 +91,26 @@
};
};
+&ipmmu_vi0 {
+ renesas,ipmmu-main = <&ipmmu_mm 11>;
+};
+
+&ipmmu_vp0 {
+ renesas,ipmmu-main = <&ipmmu_mm 12>;
+};
+
+&ipmmu_vc0 {
+ renesas,ipmmu-main = <&ipmmu_mm 9>;
+};
+
+&ipmmu_vc1 {
+ renesas,ipmmu-main = <&ipmmu_mm 10>;
+};
+
+&ipmmu_rt {
+ renesas,ipmmu-main = <&ipmmu_mm 7>;
+};
+
&du {
vsps = <&vspd0 &vspd1 &vspd2 &vspd3>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 42c51f2ec30b..469ce4081b29 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -421,6 +421,151 @@
resets = <&cpg 407>;
};
+ ipmmu_vi0: mmu@febd0000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfebd0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 14>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_vi1: mmu@febe0000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfebe0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 15>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_vp0: mmu@fe990000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfe990000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 16>;
+ power-domains = <&sysc R8A7795_PD_A3VP>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_vp1: mmu@fe980000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfe980000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 17>;
+ power-domains = <&sysc R8A7795_PD_A3VP>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_vc0: mmu@fe6b0000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfe6b0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 12>;
+ power-domains = <&sysc R8A7795_PD_A3VP>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_vc1: mmu@fe6f0000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfe6f0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 13>;
+ power-domains = <&sysc R8A7795_PD_A3VP>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_pv0: mmu@fd800000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfd800000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 6>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_pv2: mmu@fd960000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfd960000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 8>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_pv3: mmu@fd970000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfd970000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 9>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_ir: mmu@ff8b0000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xff8b0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 3>;
+ power-domains = <&sysc R8A7795_PD_A3IR>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_hc: mmu@e6570000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xe6570000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 2>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_rt: mmu@ffc80000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xffc80000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 10>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_mp0: mmu@ec670000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xec670000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 4>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_ds0: mmu@e6740000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xe6740000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 0>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_ds1: mmu@e7740000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xe7740000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 1>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_mm: mmu@e67b0000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xe67b0000 0 0x1000>;
+ interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
dmac0: dma-controller@e6700000 {
compatible = "renesas,dmac-r8a7795",
"renesas,rcar-dmac";
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 01/15] arm64: dts: renesas: r8a7795: Add IPMMU device nodes
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Add r8a7795 IPMMU nodes and keep all disabled by default.
This includes all IPMMU devices for r8a7795 ES2.0. Those
not present in r8a7795 ES1.x are removed from the DT for those
SoCs using delete-node. A follow-up patch will add IPMMU devices
to ES1.x which are not also present in ES2.0.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
v5 [Simon Horman]
* Correct ES1.x override for ipmmu_vc0
* Add ES1.x override for ipmmu_vc1
* Drop mostly redundant comments from nodes
* Add power domains
* Consistently mark all nodes as disabled
v4 [Simon Horman]
* Add IPMMU-VI1, IPMMU-VP1 IPMMU-PV2 and IPMMU-PV3
* Rename IPMMU-VP as IPMMU-VP0 and IPMMU-VI as IPMMU-VI0
as per recent datasheet naming
* Do not add IPMMU-MP1 or IPMMU-SY,
these will be added to ES1.x by follow-up patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 25 +++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 145 +++++++++++++++++++++++++++
2 files changed, 170 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 655dd30639c5..246323eacb56 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -21,6 +21,11 @@
status = "disabled";
};
+ /delete-node/ mmu at febe0000;
+ /delete-node/ mmu at fe980000;
+ /delete-node/ mmu at fd960000;
+ /delete-node/ mmu at fd970000;
+
/delete-node/ usb-phy at ee0e0200;
/delete-node/ usb at ee0e0100;
/delete-node/ usb at ee0e0000;
@@ -86,6 +91,26 @@
};
};
+&ipmmu_vi0 {
+ renesas,ipmmu-main = <&ipmmu_mm 11>;
+};
+
+&ipmmu_vp0 {
+ renesas,ipmmu-main = <&ipmmu_mm 12>;
+};
+
+&ipmmu_vc0 {
+ renesas,ipmmu-main = <&ipmmu_mm 9>;
+};
+
+&ipmmu_vc1 {
+ renesas,ipmmu-main = <&ipmmu_mm 10>;
+};
+
+&ipmmu_rt {
+ renesas,ipmmu-main = <&ipmmu_mm 7>;
+};
+
&du {
vsps = <&vspd0 &vspd1 &vspd2 &vspd3>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 42c51f2ec30b..469ce4081b29 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -421,6 +421,151 @@
resets = <&cpg 407>;
};
+ ipmmu_vi0: mmu at febd0000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfebd0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 14>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_vi1: mmu at febe0000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfebe0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 15>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_vp0: mmu at fe990000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfe990000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 16>;
+ power-domains = <&sysc R8A7795_PD_A3VP>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_vp1: mmu at fe980000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfe980000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 17>;
+ power-domains = <&sysc R8A7795_PD_A3VP>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_vc0: mmu at fe6b0000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfe6b0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 12>;
+ power-domains = <&sysc R8A7795_PD_A3VP>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_vc1: mmu at fe6f0000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfe6f0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 13>;
+ power-domains = <&sysc R8A7795_PD_A3VP>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_pv0: mmu at fd800000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfd800000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 6>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_pv2: mmu at fd960000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfd960000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 8>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_pv3: mmu at fd970000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xfd970000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 9>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_ir: mmu at ff8b0000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xff8b0000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 3>;
+ power-domains = <&sysc R8A7795_PD_A3IR>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_hc: mmu at e6570000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xe6570000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 2>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_rt: mmu at ffc80000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xffc80000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 10>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_mp0: mmu at ec670000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xec670000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 4>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_ds0: mmu at e6740000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xe6740000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 0>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_ds1: mmu at e7740000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xe7740000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 1>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_mm: mmu at e67b0000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xe67b0000 0 0x1000>;
+ interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
dmac0: dma-controller at e6700000 {
compatible = "renesas,dmac-r8a7795",
"renesas,rcar-dmac";
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 02/15] arm64: dts: renesas: r8a7795-es1: Add IPMMU device nodes
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Add r8a7795 ES1.x IPMMU nodes and keep all disabled by default.
This is a follow-up to a patch that adds IPMMU device nodes that
are common to r8a7795 ES1.x and ES2.0
Power domains are omitted as they appear to be undocumented.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
v5 [Simon Horman]
* Added reviewed-by tag from Geert Uytterhoeven
* Dropped somewhat redundant comments from nodes
v4 [Simon Horman]
* Broke out of larger patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 246323eacb56..38b7cfb3b428 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -26,6 +26,22 @@
/delete-node/ mmu@fd960000;
/delete-node/ mmu@fd970000;
+ ipmmu_mp1: mmu@ec680000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xec680000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 5>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_sy: mmu@e7730000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xe7730000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 8>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
/delete-node/ usb-phy@ee0e0200;
/delete-node/ usb@ee0e0100;
/delete-node/ usb@ee0e0000;
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 02/15] arm64: dts: renesas: r8a7795-es1: Add IPMMU device nodes
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Add r8a7795 ES1.x IPMMU nodes and keep all disabled by default.
This is a follow-up to a patch that adds IPMMU device nodes that
are common to r8a7795 ES1.x and ES2.0
Power domains are omitted as they appear to be undocumented.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
v5 [Simon Horman]
* Added reviewed-by tag from Geert Uytterhoeven
* Dropped somewhat redundant comments from nodes
v4 [Simon Horman]
* Broke out of larger patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 246323eacb56..38b7cfb3b428 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -26,6 +26,22 @@
/delete-node/ mmu at fd960000;
/delete-node/ mmu at fd970000;
+ ipmmu_mp1: mmu at ec680000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xec680000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 5>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
+ ipmmu_sy: mmu at e7730000 {
+ compatible = "renesas,ipmmu-r8a7795";
+ reg = <0 0xe7730000 0 0x1000>;
+ renesas,ipmmu-main = <&ipmmu_mm 8>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
/delete-node/ usb-phy at ee0e0200;
/delete-node/ usb at ee0e0100;
/delete-node/ usb at ee0e0000;
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 03/15] arm64: dts: renesas: r8a7795: Tie SYS-DMAC to IPMMU-DS0/1
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Hook up r8a7795 SYS-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>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of a larger patch
* Added reviewed by tag from Laurent Pinchart
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 469ce4081b29..bff0e3a3e582 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -598,6 +598,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@e7300000 {
@@ -632,6 +640,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@e7310000 {
@@ -666,6 +682,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@ec700000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 03/15] arm64: dts: renesas: r8a7795: Tie SYS-DMAC to IPMMU-DS0/1
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Hook up r8a7795 SYS-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>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of a larger patch
* Added reviewed by tag from Laurent Pinchart
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 469ce4081b29..bff0e3a3e582 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -598,6 +598,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 {
@@ -632,6 +640,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 {
@@ -666,6 +682,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] 40+ messages in thread
* [PATCH v5 04/15] arm64: dts: renesas: r8a7795: Tie Audio-DMAC to IPMMU-MP0/1
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Hook up r8a7795 ES2.0 Audio-DMAC nodes to the IPMMU-MP0.
Hook up r8a7795 ES1.x Audio-DMAC nodes to the IPMMU-MP1.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of larger patch
* Use IPMMU-MP0 rather than IPMMU-MP1 for ES2.0
* Added reviewed by tag from Laurent Pinchart
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 22 ++++++++++++++++++++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 16 ++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 38b7cfb3b428..2dfe8108072c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -127,6 +127,28 @@
renesas,ipmmu-main = <&ipmmu_mm 7>;
};
+&audma0 {
+ iommus = <&ipmmu_mp1 0>, <&ipmmu_mp1 1>,
+ <&ipmmu_mp1 2>, <&ipmmu_mp1 3>,
+ <&ipmmu_mp1 4>, <&ipmmu_mp1 5>,
+ <&ipmmu_mp1 6>, <&ipmmu_mp1 7>,
+ <&ipmmu_mp1 8>, <&ipmmu_mp1 9>,
+ <&ipmmu_mp1 10>, <&ipmmu_mp1 11>,
+ <&ipmmu_mp1 12>, <&ipmmu_mp1 13>,
+ <&ipmmu_mp1 14>, <&ipmmu_mp1 15>;
+};
+
+&audma1 {
+ iommus = <&ipmmu_mp1 16>, <&ipmmu_mp1 17>,
+ <&ipmmu_mp1 18>, <&ipmmu_mp1 19>,
+ <&ipmmu_mp1 20>, <&ipmmu_mp1 21>,
+ <&ipmmu_mp1 22>, <&ipmmu_mp1 23>,
+ <&ipmmu_mp1 24>, <&ipmmu_mp1 25>,
+ <&ipmmu_mp1 26>, <&ipmmu_mp1 27>,
+ <&ipmmu_mp1 28>, <&ipmmu_mp1 29>,
+ <&ipmmu_mp1 30>, <&ipmmu_mp1 31>;
+};
+
&du {
vsps = <&vspd0 &vspd1 &vspd2 &vspd3>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index bff0e3a3e582..b13176feec89 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -724,6 +724,14 @@
resets = <&cpg 502>;
#dma-cells = <1>;
dma-channels = <16>;
+ iommus = <&ipmmu_mp0 0>, <&ipmmu_mp0 1>,
+ <&ipmmu_mp0 2>, <&ipmmu_mp0 3>,
+ <&ipmmu_mp0 4>, <&ipmmu_mp0 5>,
+ <&ipmmu_mp0 6>, <&ipmmu_mp0 7>,
+ <&ipmmu_mp0 8>, <&ipmmu_mp0 9>,
+ <&ipmmu_mp0 10>, <&ipmmu_mp0 11>,
+ <&ipmmu_mp0 12>, <&ipmmu_mp0 13>,
+ <&ipmmu_mp0 14>, <&ipmmu_mp0 15>;
};
audma1: dma-controller@ec720000 {
@@ -758,6 +766,14 @@
resets = <&cpg 501>;
#dma-cells = <1>;
dma-channels = <16>;
+ iommus = <&ipmmu_mp0 16>, <&ipmmu_mp0 17>,
+ <&ipmmu_mp0 18>, <&ipmmu_mp0 19>,
+ <&ipmmu_mp0 20>, <&ipmmu_mp0 21>,
+ <&ipmmu_mp0 22>, <&ipmmu_mp0 23>,
+ <&ipmmu_mp0 24>, <&ipmmu_mp0 25>,
+ <&ipmmu_mp0 26>, <&ipmmu_mp0 27>,
+ <&ipmmu_mp0 28>, <&ipmmu_mp0 29>,
+ <&ipmmu_mp0 30>, <&ipmmu_mp0 31>;
};
avb: ethernet@e6800000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 04/15] arm64: dts: renesas: r8a7795: Tie Audio-DMAC to IPMMU-MP0/1
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Hook up r8a7795 ES2.0 Audio-DMAC nodes to the IPMMU-MP0.
Hook up r8a7795 ES1.x Audio-DMAC nodes to the IPMMU-MP1.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of larger patch
* Use IPMMU-MP0 rather than IPMMU-MP1 for ES2.0
* Added reviewed by tag from Laurent Pinchart
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 22 ++++++++++++++++++++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 16 ++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 38b7cfb3b428..2dfe8108072c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -127,6 +127,28 @@
renesas,ipmmu-main = <&ipmmu_mm 7>;
};
+&audma0 {
+ iommus = <&ipmmu_mp1 0>, <&ipmmu_mp1 1>,
+ <&ipmmu_mp1 2>, <&ipmmu_mp1 3>,
+ <&ipmmu_mp1 4>, <&ipmmu_mp1 5>,
+ <&ipmmu_mp1 6>, <&ipmmu_mp1 7>,
+ <&ipmmu_mp1 8>, <&ipmmu_mp1 9>,
+ <&ipmmu_mp1 10>, <&ipmmu_mp1 11>,
+ <&ipmmu_mp1 12>, <&ipmmu_mp1 13>,
+ <&ipmmu_mp1 14>, <&ipmmu_mp1 15>;
+};
+
+&audma1 {
+ iommus = <&ipmmu_mp1 16>, <&ipmmu_mp1 17>,
+ <&ipmmu_mp1 18>, <&ipmmu_mp1 19>,
+ <&ipmmu_mp1 20>, <&ipmmu_mp1 21>,
+ <&ipmmu_mp1 22>, <&ipmmu_mp1 23>,
+ <&ipmmu_mp1 24>, <&ipmmu_mp1 25>,
+ <&ipmmu_mp1 26>, <&ipmmu_mp1 27>,
+ <&ipmmu_mp1 28>, <&ipmmu_mp1 29>,
+ <&ipmmu_mp1 30>, <&ipmmu_mp1 31>;
+};
+
&du {
vsps = <&vspd0 &vspd1 &vspd2 &vspd3>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index bff0e3a3e582..b13176feec89 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -724,6 +724,14 @@
resets = <&cpg 502>;
#dma-cells = <1>;
dma-channels = <16>;
+ iommus = <&ipmmu_mp0 0>, <&ipmmu_mp0 1>,
+ <&ipmmu_mp0 2>, <&ipmmu_mp0 3>,
+ <&ipmmu_mp0 4>, <&ipmmu_mp0 5>,
+ <&ipmmu_mp0 6>, <&ipmmu_mp0 7>,
+ <&ipmmu_mp0 8>, <&ipmmu_mp0 9>,
+ <&ipmmu_mp0 10>, <&ipmmu_mp0 11>,
+ <&ipmmu_mp0 12>, <&ipmmu_mp0 13>,
+ <&ipmmu_mp0 14>, <&ipmmu_mp0 15>;
};
audma1: dma-controller at ec720000 {
@@ -758,6 +766,14 @@
resets = <&cpg 501>;
#dma-cells = <1>;
dma-channels = <16>;
+ iommus = <&ipmmu_mp0 16>, <&ipmmu_mp0 17>,
+ <&ipmmu_mp0 18>, <&ipmmu_mp0 19>,
+ <&ipmmu_mp0 20>, <&ipmmu_mp0 21>,
+ <&ipmmu_mp0 22>, <&ipmmu_mp0 23>,
+ <&ipmmu_mp0 24>, <&ipmmu_mp0 25>,
+ <&ipmmu_mp0 26>, <&ipmmu_mp0 27>,
+ <&ipmmu_mp0 28>, <&ipmmu_mp0 29>,
+ <&ipmmu_mp0 30>, <&ipmmu_mp0 31>;
};
avb: ethernet at e6800000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 05/15] arm64: dts: renesas: r8a7795: Point DU/VSPD via FCPVD to IPMMU-VI0/1
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPVD devices to allow use of the VSP and DU
together with IPMMU-VI1 and IPMMU-VI1.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of a larger patch
* Use IPMMU-VI1 for fcpvd2 on ES2.0
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 4 ++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 3 +++
2 files changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 2dfe8108072c..71499d193ddb 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -149,6 +149,10 @@
<&ipmmu_mp1 30>, <&ipmmu_mp1 31>;
};
+&fcpvd2 {
+ iommus = <&ipmmu_vi0 10>;
+};
+
&du {
vsps = <&vspd0 &vspd1 &vspd2 &vspd3>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index b13176feec89..d5e3d208bc37 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2154,6 +2154,7 @@
clocks = <&cpg CPG_MOD 603>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 603>;
+ iommus = <&ipmmu_vi0 8>;
};
vspd1: vsp@fea28000 {
@@ -2173,6 +2174,7 @@
clocks = <&cpg CPG_MOD 602>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 602>;
+ iommus = <&ipmmu_vi0 9>;
};
vspd2: vsp@fea30000 {
@@ -2192,6 +2194,7 @@
clocks = <&cpg CPG_MOD 601>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 601>;
+ iommus = <&ipmmu_vi1 10>;
};
fdp1@fe940000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 05/15] arm64: dts: renesas: r8a7795: Point DU/VSPD via FCPVD to IPMMU-VI0/1
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPVD devices to allow use of the VSP and DU
together with IPMMU-VI1 and IPMMU-VI1.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of a larger patch
* Use IPMMU-VI1 for fcpvd2 on ES2.0
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 4 ++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 3 +++
2 files changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 2dfe8108072c..71499d193ddb 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -149,6 +149,10 @@
<&ipmmu_mp1 30>, <&ipmmu_mp1 31>;
};
+&fcpvd2 {
+ iommus = <&ipmmu_vi0 10>;
+};
+
&du {
vsps = <&vspd0 &vspd1 &vspd2 &vspd3>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index b13176feec89..d5e3d208bc37 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2154,6 +2154,7 @@
clocks = <&cpg CPG_MOD 603>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 603>;
+ iommus = <&ipmmu_vi0 8>;
};
vspd1: vsp at fea28000 {
@@ -2173,6 +2174,7 @@
clocks = <&cpg CPG_MOD 602>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 602>;
+ iommus = <&ipmmu_vi0 9>;
};
vspd2: vsp at fea30000 {
@@ -2192,6 +2194,7 @@
clocks = <&cpg CPG_MOD 601>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 601>;
+ iommus = <&ipmmu_vi1 10>;
};
fdp1 at fe940000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 06/15] arm64: dts: renesas: r8a7795-es1: Point DU/VSPD via FCPVD to IPMMU-VI0
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPVD devices to allow use of the VSP and DU
together with IPMMU-VI0.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* broke out of a larger patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 71499d193ddb..1eafa5382e86 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -94,6 +94,7 @@
clocks = <&cpg CPG_MOD 600>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 600>;
+ iommus = <&ipmmu_vi0 11>;
};
fdp1@fe948000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 06/15] arm64: dts: renesas: r8a7795-es1: Point DU/VSPD via FCPVD to IPMMU-VI0
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPVD devices to allow use of the VSP and DU
together with IPMMU-VI0.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* broke out of a larger patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 71499d193ddb..1eafa5382e86 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -94,6 +94,7 @@
clocks = <&cpg CPG_MOD 600>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 600>;
+ iommus = <&ipmmu_vi0 11>;
};
fdp1 at fe948000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 07/15] arm64: dts: renesas: r8a7795: Point FDP1 via FCPF to IPMMU-VP0/1
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPF devices to allow use of FDP1 with IPMMU-VP.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of larger patch
* Use IPMMU-VP1 for FCPF1 on ES2.0
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 4 ++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 ++
2 files changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 1eafa5382e86..6b4dfa42f5b2 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -150,6 +150,10 @@
<&ipmmu_mp1 30>, <&ipmmu_mp1 31>;
};
+&fcpf1 {
+ iommus = <&ipmmu_vp0 1>;
+};
+
&fcpvd2 {
iommus = <&ipmmu_vi0 10>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index d5e3d208bc37..1202b84104a0 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2070,6 +2070,7 @@
clocks = <&cpg CPG_MOD 615>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 615>;
+ iommus = <&ipmmu_vp0 0>;
};
fcpf1: fcp@fe951000 {
@@ -2078,6 +2079,7 @@
clocks = <&cpg CPG_MOD 614>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 614>;
+ iommus = <&ipmmu_vp1 1>;
};
vspbd: vsp@fe960000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 07/15] arm64: dts: renesas: r8a7795: Point FDP1 via FCPF to IPMMU-VP0/1
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPF devices to allow use of FDP1 with IPMMU-VP.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of larger patch
* Use IPMMU-VP1 for FCPF1 on ES2.0
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 4 ++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 ++
2 files changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 1eafa5382e86..6b4dfa42f5b2 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -150,6 +150,10 @@
<&ipmmu_mp1 30>, <&ipmmu_mp1 31>;
};
+&fcpf1 {
+ iommus = <&ipmmu_vp0 1>;
+};
+
&fcpvd2 {
iommus = <&ipmmu_vi0 10>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index d5e3d208bc37..1202b84104a0 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2070,6 +2070,7 @@
clocks = <&cpg CPG_MOD 615>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 615>;
+ iommus = <&ipmmu_vp0 0>;
};
fcpf1: fcp at fe951000 {
@@ -2078,6 +2079,7 @@
clocks = <&cpg CPG_MOD 614>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 614>;
+ iommus = <&ipmmu_vp1 1>;
};
vspbd: vsp at fe960000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 08/15] arm64: dts: renesas: r8a7795-es1: Point FDP1 via FCPF to IPMMU-VP0
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPF devices to allow use of FDP1 with IPMMU-VP0.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* broke out of larger patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 6b4dfa42f5b2..736281335653 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -56,6 +56,7 @@
clocks = <&cpg CPG_MOD 613>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 613>;
+ iommus = <&ipmmu_vp0 2>;
};
vspi2: vsp@fe9c0000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 08/15] arm64: dts: renesas: r8a7795-es1: Point FDP1 via FCPF to IPMMU-VP0
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPF devices to allow use of FDP1 with IPMMU-VP0.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* broke out of larger patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 6b4dfa42f5b2..736281335653 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -56,6 +56,7 @@
clocks = <&cpg CPG_MOD 613>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 613>;
+ iommus = <&ipmmu_vp0 2>;
};
vspi2: vsp at fe9c0000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 09/15] arm64: dts: renesas: r8a7795: Point VSPBC/VSPBD via FCPVB to IPMMU-VP0/1
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPVB devices to allow use of VSPBC/VSPBD with
IPMMU-VP0 and IPMMU-VP1.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Use IPMMU-VP1 for FCPVP1 on ES2.0
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 4 ++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 ++
2 files changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 736281335653..3d50627c0670 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -151,6 +151,10 @@
<&ipmmu_mp1 30>, <&ipmmu_mp1 31>;
};
+&fcpvb1 {
+ iommus = <&ipmmu_vp0 7>;
+};
+
&fcpf1 {
iommus = <&ipmmu_vp0 1>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 1202b84104a0..cf9708ac46eb 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2062,6 +2062,7 @@
clocks = <&cpg CPG_MOD 606>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 606>;
+ iommus = <&ipmmu_vp1 7>;
};
fcpf0: fcp@fe950000 {
@@ -2099,6 +2100,7 @@
clocks = <&cpg CPG_MOD 607>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 607>;
+ iommus = <&ipmmu_vp0 5>;
};
vspi0: vsp@fe9a0000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 09/15] arm64: dts: renesas: r8a7795: Point VSPBC/VSPBD via FCPVB to IPMMU-VP0/1
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPVB devices to allow use of VSPBC/VSPBD with
IPMMU-VP0 and IPMMU-VP1.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Use IPMMU-VP1 for FCPVP1 on ES2.0
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 4 ++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 ++
2 files changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 736281335653..3d50627c0670 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -151,6 +151,10 @@
<&ipmmu_mp1 30>, <&ipmmu_mp1 31>;
};
+&fcpvb1 {
+ iommus = <&ipmmu_vp0 7>;
+};
+
&fcpf1 {
iommus = <&ipmmu_vp0 1>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 1202b84104a0..cf9708ac46eb 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2062,6 +2062,7 @@
clocks = <&cpg CPG_MOD 606>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 606>;
+ iommus = <&ipmmu_vp1 7>;
};
fcpf0: fcp at fe950000 {
@@ -2099,6 +2100,7 @@
clocks = <&cpg CPG_MOD 607>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 607>;
+ iommus = <&ipmmu_vp0 5>;
};
vspi0: vsp at fe9a0000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 10/15] arm64: dts: renesas: r8a7795: Point VSPI via FCPVI to IPMMU-VP0/1
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPVI devices to allow use of VSPI with
IPMMU-VP0 and IPMMU-VP1.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* broke out of larger patch
* Use IPMMU-VP1 for FCPVI1 on ES2.0
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 4 ++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 ++
2 files changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 3d50627c0670..b2d2f04c5e1c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -159,6 +159,10 @@
iommus = <&ipmmu_vp0 1>;
};
+&fcpvi1 {
+ iommus = <&ipmmu_vp0 9>;
+};
+
&fcpvd2 {
iommus = <&ipmmu_vi0 10>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index cf9708ac46eb..851324eac5ed 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2120,6 +2120,7 @@
clocks = <&cpg CPG_MOD 611>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 611>;
+ iommus = <&ipmmu_vp0 8>;
};
vspi1: vsp@fe9b0000 {
@@ -2139,6 +2140,7 @@
clocks = <&cpg CPG_MOD 610>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 610>;
+ iommus = <&ipmmu_vp1 9>;
};
vspd0: vsp@fea20000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 10/15] arm64: dts: renesas: r8a7795: Point VSPI via FCPVI to IPMMU-VP0/1
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPVI devices to allow use of VSPI with
IPMMU-VP0 and IPMMU-VP1.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* broke out of larger patch
* Use IPMMU-VP1 for FCPVI1 on ES2.0
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 4 ++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 ++
2 files changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 3d50627c0670..b2d2f04c5e1c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -159,6 +159,10 @@
iommus = <&ipmmu_vp0 1>;
};
+&fcpvi1 {
+ iommus = <&ipmmu_vp0 9>;
+};
+
&fcpvd2 {
iommus = <&ipmmu_vi0 10>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index cf9708ac46eb..851324eac5ed 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2120,6 +2120,7 @@
clocks = <&cpg CPG_MOD 611>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 611>;
+ iommus = <&ipmmu_vp0 8>;
};
vspi1: vsp at fe9b0000 {
@@ -2139,6 +2140,7 @@
clocks = <&cpg CPG_MOD 610>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 610>;
+ iommus = <&ipmmu_vp1 9>;
};
vspd0: vsp at fea20000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 11/15] arm64: dts: renesas: r8a7795-es1: Point VSPI via FCPVI to IPMMU-VP
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPVI devices to allow use of VSPI with IPMMU-VP.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of larger patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index b2d2f04c5e1c..6713eeeab52a 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -76,6 +76,7 @@
clocks = <&cpg CPG_MOD 609>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 609>;
+ iommus = <&ipmmu_vp0 10>;
};
vspd3: vsp@fea38000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 11/15] arm64: dts: renesas: r8a7795-es1: Point VSPI via FCPVI to IPMMU-VP
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Hook up the FCPVI devices to allow use of VSPI with IPMMU-VP.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of larger patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index b2d2f04c5e1c..6713eeeab52a 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -76,6 +76,7 @@
clocks = <&cpg CPG_MOD 609>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 609>;
+ iommus = <&ipmmu_vp0 10>;
};
vspd3: vsp at fea38000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 12/15] arm64: dts: renesas: r8a7795: Connect Ethernet-AVB to IPMMU-DS0
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Add IPMMU-DS0 to the Ethernet-AVB device node.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 851324eac5ed..0fd1d1ab97d2 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -816,6 +816,7 @@
power-domains = <&sysc R8A7795_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] 40+ messages in thread
* [PATCH v5 12/15] arm64: dts: renesas: r8a7795: Connect Ethernet-AVB to IPMMU-DS0
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Add IPMMU-DS0 to the Ethernet-AVB device node.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 851324eac5ed..0fd1d1ab97d2 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -816,6 +816,7 @@
power-domains = <&sysc R8A7795_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] 40+ messages in thread
* [PATCH v5 13/15] arm64: dts: renesas: r8a7795: Connect SATA to IPMMU-HC
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Add IPMMU-HC to the SATA device node.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 0fd1d1ab97d2..f42387473a9c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -1645,6 +1645,7 @@
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 815>;
status = "disabled";
+ iommus = <&ipmmu_hc 2>;
};
xhci0: usb@ee000000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 13/15] arm64: dts: renesas: r8a7795: Connect SATA to IPMMU-HC
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Add IPMMU-HC to the SATA device node.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 0fd1d1ab97d2..f42387473a9c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -1645,6 +1645,7 @@
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 815>;
status = "disabled";
+ iommus = <&ipmmu_hc 2>;
};
xhci0: usb at ee000000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 14/15] arm64: dts: renesas: r8a7795: Enable IPMMU-VI0, VP1, DS0, DS1 and MM
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Enable the r8a7795 device nodes for IPMMU-VI0, IPMMU-VP1, IPMMU-DS0,
IPMMU-DS1 and the shared IPMMU-MM device.
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>
---
v5 [Simon Horman]
* Update changelog to reflect new IPMMU names
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of larger patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index f42387473a9c..6aa00d9b1d50 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -427,7 +427,6 @@
renesas,ipmmu-main = <&ipmmu_mm 14>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_vi1: mmu@febe0000 {
@@ -454,7 +453,6 @@
renesas,ipmmu-main = <&ipmmu_mm 17>;
power-domains = <&sysc R8A7795_PD_A3VP>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_vc0: mmu@fe6b0000 {
@@ -544,7 +542,6 @@
renesas,ipmmu-main = <&ipmmu_mm 0>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_ds1: mmu@e7740000 {
@@ -553,7 +550,6 @@
renesas,ipmmu-main = <&ipmmu_mm 1>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_mm: mmu@e67b0000 {
@@ -563,7 +559,6 @@
<GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
#iommu-cells = <1>;
- status = "disabled";
};
dmac0: dma-controller@e6700000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 14/15] arm64: dts: renesas: r8a7795: Enable IPMMU-VI0, VP1, DS0, DS1 and MM
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Enable the r8a7795 device nodes for IPMMU-VI0, IPMMU-VP1, IPMMU-DS0,
IPMMU-DS1 and the shared IPMMU-MM device.
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>
---
v5 [Simon Horman]
* Update changelog to reflect new IPMMU names
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of larger patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index f42387473a9c..6aa00d9b1d50 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -427,7 +427,6 @@
renesas,ipmmu-main = <&ipmmu_mm 14>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_vi1: mmu at febe0000 {
@@ -454,7 +453,6 @@
renesas,ipmmu-main = <&ipmmu_mm 17>;
power-domains = <&sysc R8A7795_PD_A3VP>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_vc0: mmu at fe6b0000 {
@@ -544,7 +542,6 @@
renesas,ipmmu-main = <&ipmmu_mm 0>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_ds1: mmu at e7740000 {
@@ -553,7 +550,6 @@
renesas,ipmmu-main = <&ipmmu_mm 1>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_mm: mmu at e67b0000 {
@@ -563,7 +559,6 @@
<GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
#iommu-cells = <1>;
- status = "disabled";
};
dmac0: dma-controller at e6700000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 15/15] arm64: dts: renesas: r8a7795-es1: Enable IPMMU-MP1
2017-11-10 13:25 ` Simon Horman
@ 2017-11-10 13:25 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Magnus Damm, Simon Horman
From: Magnus Damm <damm+renesas@opensource.se>
Enable the r8a7795 ES1.x device node for IPMMU-MP1.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of larger patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 6713eeeab52a..29b52d89c78a 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -31,7 +31,6 @@
reg = <0 0xec680000 0 0x1000>;
renesas,ipmmu-main = <&ipmmu_mm 5>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_sy: mmu@e7730000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH v5 15/15] arm64: dts: renesas: r8a7795-es1: Enable IPMMU-MP1
@ 2017-11-10 13:25 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-10 13:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Enable the r8a7795 ES1.x device node for IPMMU-MP1.
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>
---
v5 [Simon Horman]
* Added reviewed by tag from Geert Uytterhoeven
v4 [Simon Horman]
* Broke out of larger patch
v1 - v3 [Magnus Damm]
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 6713eeeab52a..29b52d89c78a 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -31,7 +31,6 @@
reg = <0 0xec680000 0 0x1000>;
renesas,ipmmu-main = <&ipmmu_mm 5>;
#iommu-cells = <1>;
- status = "disabled";
};
ipmmu_sy: mmu at e7730000 {
--
2.11.0
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH v5 01/15] arm64: dts: renesas: r8a7795: Add IPMMU device nodes
2017-11-10 13:25 ` Simon Horman
@ 2017-11-15 14:29 ` Geert Uytterhoeven
-1 siblings, 0 replies; 40+ messages in thread
From: Geert Uytterhoeven @ 2017-11-15 14:29 UTC (permalink / raw)
To: Simon Horman; +Cc: Linux-Renesas, linux-arm-kernel, Magnus Damm, Magnus Damm
Hi Simon,
On Fri, Nov 10, 2017 at 2:25 PM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Add r8a7795 IPMMU nodes and keep all disabled by default.
>
> This includes all IPMMU devices for r8a7795 ES2.0. Those
> not present in r8a7795 ES1.x are removed from the DT for those
> SoCs using delete-node. A follow-up patch will add IPMMU devices
> to ES1.x which are not also present in ES2.0.
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> v5 [Simon Horman]
> * Correct ES1.x override for ipmmu_vc0
> * Add ES1.x override for ipmmu_vc1
> * Drop mostly redundant comments from nodes
> * Add power domains
> * Consistently mark all nodes as disabled
Thanks for the update!
Looks like "power-domains" do work for IOMMU nodes.
However, adding them seems to postpone initialization of the IOMMUs.
With the two typos below fixed:
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> + ipmmu_vc0: mmu@fe6b0000 {
> + compatible = "renesas,ipmmu-r8a7795";
> + reg = <0 0xfe6b0000 0 0x1000>;
> + renesas,ipmmu-main = <&ipmmu_mm 12>;
> + power-domains = <&sysc R8A7795_PD_A3VP>;
R8A7795_PD_A3VC
> + #iommu-cells = <1>;
> + status = "disabled";
> + };
> +
> + ipmmu_vc1: mmu@fe6f0000 {
> + compatible = "renesas,ipmmu-r8a7795";
> + reg = <0 0xfe6f0000 0 0x1000>;
> + renesas,ipmmu-main = <&ipmmu_mm 13>;
> + power-domains = <&sysc R8A7795_PD_A3VP>;
R8A7795_PD_A3VC
> + #iommu-cells = <1>;
> + status = "disabled";
> + };
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
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v5 01/15] arm64: dts: renesas: r8a7795: Add IPMMU device nodes
@ 2017-11-15 14:29 ` Geert Uytterhoeven
0 siblings, 0 replies; 40+ messages in thread
From: Geert Uytterhoeven @ 2017-11-15 14:29 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon,
On Fri, Nov 10, 2017 at 2:25 PM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Add r8a7795 IPMMU nodes and keep all disabled by default.
>
> This includes all IPMMU devices for r8a7795 ES2.0. Those
> not present in r8a7795 ES1.x are removed from the DT for those
> SoCs using delete-node. A follow-up patch will add IPMMU devices
> to ES1.x which are not also present in ES2.0.
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> v5 [Simon Horman]
> * Correct ES1.x override for ipmmu_vc0
> * Add ES1.x override for ipmmu_vc1
> * Drop mostly redundant comments from nodes
> * Add power domains
> * Consistently mark all nodes as disabled
Thanks for the update!
Looks like "power-domains" do work for IOMMU nodes.
However, adding them seems to postpone initialization of the IOMMUs.
With the two typos below fixed:
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> + ipmmu_vc0: mmu at fe6b0000 {
> + compatible = "renesas,ipmmu-r8a7795";
> + reg = <0 0xfe6b0000 0 0x1000>;
> + renesas,ipmmu-main = <&ipmmu_mm 12>;
> + power-domains = <&sysc R8A7795_PD_A3VP>;
R8A7795_PD_A3VC
> + #iommu-cells = <1>;
> + status = "disabled";
> + };
> +
> + ipmmu_vc1: mmu at fe6f0000 {
> + compatible = "renesas,ipmmu-r8a7795";
> + reg = <0 0xfe6f0000 0 0x1000>;
> + renesas,ipmmu-main = <&ipmmu_mm 13>;
> + power-domains = <&sysc R8A7795_PD_A3VP>;
R8A7795_PD_A3VC
> + #iommu-cells = <1>;
> + status = "disabled";
> + };
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] 40+ messages in thread
* Re: [PATCH v5 02/15] arm64: dts: renesas: r8a7795-es1: Add IPMMU device nodes
2017-11-10 13:25 ` Simon Horman
@ 2017-11-15 14:33 ` Geert Uytterhoeven
-1 siblings, 0 replies; 40+ messages in thread
From: Geert Uytterhoeven @ 2017-11-15 14:33 UTC (permalink / raw)
To: Simon Horman; +Cc: Linux-Renesas, linux-arm-kernel, Magnus Damm, Magnus Damm
On Fri, Nov 10, 2017 at 2:25 PM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Add r8a7795 ES1.x IPMMU nodes and keep all disabled by default.
>
> This is a follow-up to a patch that adds IPMMU device nodes that
> are common to r8a7795 ES1.x and ES2.0
>
> Power domains are omitted as they appear to be undocumented.
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> v5 [Simon Horman]
> * Added reviewed-by tag from Geert Uytterhoeven
Nope, you didn't ;-)
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v5 02/15] arm64: dts: renesas: r8a7795-es1: Add IPMMU device nodes
@ 2017-11-15 14:33 ` Geert Uytterhoeven
0 siblings, 0 replies; 40+ messages in thread
From: Geert Uytterhoeven @ 2017-11-15 14:33 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Nov 10, 2017 at 2:25 PM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Add r8a7795 ES1.x IPMMU nodes and keep all disabled by default.
>
> This is a follow-up to a patch that adds IPMMU device nodes that
> are common to r8a7795 ES1.x and ES2.0
>
> Power domains are omitted as they appear to be undocumented.
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> v5 [Simon Horman]
> * Added reviewed-by tag from Geert Uytterhoeven
Nope, you didn't ;-)
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] 40+ messages in thread
* Re: [PATCH v5 01/15] arm64: dts: renesas: r8a7795: Add IPMMU device nodes
2017-11-15 14:29 ` Geert Uytterhoeven
@ 2017-11-17 13:39 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-17 13:39 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Linux-Renesas, linux-arm-kernel, Magnus Damm, Magnus Damm
On Wed, Nov 15, 2017 at 03:29:55PM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
>
> On Fri, Nov 10, 2017 at 2:25 PM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
> > From: Magnus Damm <damm+renesas@opensource.se>
> >
> > Add r8a7795 IPMMU nodes and keep all disabled by default.
> >
> > This includes all IPMMU devices for r8a7795 ES2.0. Those
> > not present in r8a7795 ES1.x are removed from the DT for those
> > SoCs using delete-node. A follow-up patch will add IPMMU devices
> > to ES1.x which are not also present in ES2.0.
> >
> > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > ---
> > v5 [Simon Horman]
> > * Correct ES1.x override for ipmmu_vc0
> > * Add ES1.x override for ipmmu_vc1
> > * Drop mostly redundant comments from nodes
> > * Add power domains
> > * Consistently mark all nodes as disabled
>
> Thanks for the update!
>
> Looks like "power-domains" do work for IOMMU nodes.
> However, adding them seems to postpone initialization of the IOMMUs.
>
> With the two typos below fixed:
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Thanks, I have applied this patch with those fixes and your tag.
>
> > --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
>
> > + ipmmu_vc0: mmu@fe6b0000 {
> > + compatible = "renesas,ipmmu-r8a7795";
> > + reg = <0 0xfe6b0000 0 0x1000>;
> > + renesas,ipmmu-main = <&ipmmu_mm 12>;
> > + power-domains = <&sysc R8A7795_PD_A3VP>;
>
> R8A7795_PD_A3VC
>
> > + #iommu-cells = <1>;
> > + status = "disabled";
> > + };
> > +
> > + ipmmu_vc1: mmu@fe6f0000 {
> > + compatible = "renesas,ipmmu-r8a7795";
> > + reg = <0 0xfe6f0000 0 0x1000>;
> > + renesas,ipmmu-main = <&ipmmu_mm 13>;
> > + power-domains = <&sysc R8A7795_PD_A3VP>;
>
> R8A7795_PD_A3VC
>
> > + #iommu-cells = <1>;
> > + status = "disabled";
> > + };
>
> 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
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v5 01/15] arm64: dts: renesas: r8a7795: Add IPMMU device nodes
@ 2017-11-17 13:39 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-17 13:39 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 15, 2017 at 03:29:55PM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
>
> On Fri, Nov 10, 2017 at 2:25 PM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
> > From: Magnus Damm <damm+renesas@opensource.se>
> >
> > Add r8a7795 IPMMU nodes and keep all disabled by default.
> >
> > This includes all IPMMU devices for r8a7795 ES2.0. Those
> > not present in r8a7795 ES1.x are removed from the DT for those
> > SoCs using delete-node. A follow-up patch will add IPMMU devices
> > to ES1.x which are not also present in ES2.0.
> >
> > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > ---
> > v5 [Simon Horman]
> > * Correct ES1.x override for ipmmu_vc0
> > * Add ES1.x override for ipmmu_vc1
> > * Drop mostly redundant comments from nodes
> > * Add power domains
> > * Consistently mark all nodes as disabled
>
> Thanks for the update!
>
> Looks like "power-domains" do work for IOMMU nodes.
> However, adding them seems to postpone initialization of the IOMMUs.
>
> With the two typos below fixed:
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Thanks, I have applied this patch with those fixes and your tag.
>
> > --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
>
> > + ipmmu_vc0: mmu at fe6b0000 {
> > + compatible = "renesas,ipmmu-r8a7795";
> > + reg = <0 0xfe6b0000 0 0x1000>;
> > + renesas,ipmmu-main = <&ipmmu_mm 12>;
> > + power-domains = <&sysc R8A7795_PD_A3VP>;
>
> R8A7795_PD_A3VC
>
> > + #iommu-cells = <1>;
> > + status = "disabled";
> > + };
> > +
> > + ipmmu_vc1: mmu at fe6f0000 {
> > + compatible = "renesas,ipmmu-r8a7795";
> > + reg = <0 0xfe6f0000 0 0x1000>;
> > + renesas,ipmmu-main = <&ipmmu_mm 13>;
> > + power-domains = <&sysc R8A7795_PD_A3VP>;
>
> R8A7795_PD_A3VC
>
> > + #iommu-cells = <1>;
> > + status = "disabled";
> > + };
>
> 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] 40+ messages in thread
* Re: [PATCH v5 00/15] arm64: dts: renesas: r8a7795: IPMMU upstream integration
2017-11-10 13:25 ` Simon Horman
@ 2017-11-17 13:39 ` Simon Horman
-1 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-17 13:39 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: linux-arm-kernel, Magnus Damm
On Fri, Nov 10, 2017 at 02:25:17PM +0100, Simon Horman wrote:
> This series adds DT nodes for IPMMU instances on r8a7795 together with
> connections to various r8a7795 on-chip devices such as Audio-DMAC, SYS-DMAC,
> Ethernet-AVB, SATA and a bunch of multimedia devices that make use of FCP.
>
> With these patches applied a white list enabled IPMMU driver may be used
> to check silicon revision and then enable IPMMU in the known working cases.
>
> The recommended test stack for this patchset is a merge of
> * The iommu/next branch of the vfio tree
> * renesas-devel-20171110-v4.14-rc8 tag of the renesas tree
>
> The final two patches in the series enable IPMMU support for all IPMMU
> instances on r8a7795 that are used by IPMMU devices listed above with one
> exception. The exception is the SATA device connected to IPMMU-HC which
> still is disabled pending IPMMU USB integration support. I expect IPMMU USB
> integration to be handled as a second step once this series is agreed on.
>
> The DT binding for r8a7795 has since long been included in mainline and
> this series implements support following such format:
>
> d4e42e7 iommu/ipmmu-vmsa: Add r8a7795 DT binding
I have applied this series.
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v5 00/15] arm64: dts: renesas: r8a7795: IPMMU upstream integration
@ 2017-11-17 13:39 ` Simon Horman
0 siblings, 0 replies; 40+ messages in thread
From: Simon Horman @ 2017-11-17 13:39 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Nov 10, 2017 at 02:25:17PM +0100, Simon Horman wrote:
> This series adds DT nodes for IPMMU instances on r8a7795 together with
> connections to various r8a7795 on-chip devices such as Audio-DMAC, SYS-DMAC,
> Ethernet-AVB, SATA and a bunch of multimedia devices that make use of FCP.
>
> With these patches applied a white list enabled IPMMU driver may be used
> to check silicon revision and then enable IPMMU in the known working cases.
>
> The recommended test stack for this patchset is a merge of
> * The iommu/next branch of the vfio tree
> * renesas-devel-20171110-v4.14-rc8 tag of the renesas tree
>
> The final two patches in the series enable IPMMU support for all IPMMU
> instances on r8a7795 that are used by IPMMU devices listed above with one
> exception. The exception is the SATA device connected to IPMMU-HC which
> still is disabled pending IPMMU USB integration support. I expect IPMMU USB
> integration to be handled as a second step once this series is agreed on.
>
> The DT binding for r8a7795 has since long been included in mainline and
> this series implements support following such format:
>
> d4e42e7 iommu/ipmmu-vmsa: Add r8a7795 DT binding
I have applied this series.
^ permalink raw reply [flat|nested] 40+ messages in thread
end of thread, other threads:[~2017-11-17 13:39 UTC | newest]
Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-10 13:25 [PATCH v5 00/15] arm64: dts: renesas: r8a7795: IPMMU upstream integration Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 01/15] arm64: dts: renesas: r8a7795: Add IPMMU device nodes Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-15 14:29 ` Geert Uytterhoeven
2017-11-15 14:29 ` Geert Uytterhoeven
2017-11-17 13:39 ` Simon Horman
2017-11-17 13:39 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 02/15] arm64: dts: renesas: r8a7795-es1: " Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-15 14:33 ` Geert Uytterhoeven
2017-11-15 14:33 ` Geert Uytterhoeven
2017-11-10 13:25 ` [PATCH v5 03/15] arm64: dts: renesas: r8a7795: Tie SYS-DMAC to IPMMU-DS0/1 Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 04/15] arm64: dts: renesas: r8a7795: Tie Audio-DMAC to IPMMU-MP0/1 Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 05/15] arm64: dts: renesas: r8a7795: Point DU/VSPD via FCPVD to IPMMU-VI0/1 Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 06/15] arm64: dts: renesas: r8a7795-es1: Point DU/VSPD via FCPVD to IPMMU-VI0 Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 07/15] arm64: dts: renesas: r8a7795: Point FDP1 via FCPF to IPMMU-VP0/1 Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 08/15] arm64: dts: renesas: r8a7795-es1: Point FDP1 via FCPF to IPMMU-VP0 Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 09/15] arm64: dts: renesas: r8a7795: Point VSPBC/VSPBD via FCPVB to IPMMU-VP0/1 Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 10/15] arm64: dts: renesas: r8a7795: Point VSPI via FCPVI " Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 11/15] arm64: dts: renesas: r8a7795-es1: Point VSPI via FCPVI to IPMMU-VP Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 12/15] arm64: dts: renesas: r8a7795: Connect Ethernet-AVB to IPMMU-DS0 Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 13/15] arm64: dts: renesas: r8a7795: Connect SATA to IPMMU-HC Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 14/15] arm64: dts: renesas: r8a7795: Enable IPMMU-VI0, VP1, DS0, DS1 and MM Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-10 13:25 ` [PATCH v5 15/15] arm64: dts: renesas: r8a7795-es1: Enable IPMMU-MP1 Simon Horman
2017-11-10 13:25 ` Simon Horman
2017-11-17 13:39 ` [PATCH v5 00/15] arm64: dts: renesas: r8a7795: IPMMU upstream integration Simon Horman
2017-11-17 13:39 ` Simon Horman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.