* [PATCH v2] arm64: dts: renesas: Add IOMMU related properties into PCIe host nodes
@ 2023-04-26 8:28 Yoshihiro Shimoda
2023-05-03 12:38 ` Geert Uytterhoeven
0 siblings, 1 reply; 5+ messages in thread
From: Yoshihiro Shimoda @ 2023-04-26 8:28 UTC (permalink / raw)
To: geert+renesas, magnus.damm; +Cc: linux-renesas-soc, Yoshihiro Shimoda
Add iommu-map and iommu-map-mask properties into PCIe host nodes.
Note that iommu-map-mask should be zero because the IPMMU assigns
one micro TLB ID only to the PCIe host.
Also change dma-ranges arguments for IOMMU. Notes that the dma-ranges
can be used if IOMMU is disabled.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
Changes from v1:
https://lore.kernel.org/all/20230421122608.3389397-1-yoshihiro.shimoda.uh@renesas.com/
- Drop iommus property.
- Add iommu-map-mask property.
- Revise the commit description.
arch/arm64/boot/dts/renesas/r8a77951.dtsi | 12 ++++++++----
arch/arm64/boot/dts/renesas/r8a77960.dtsi | 12 ++++++++----
arch/arm64/boot/dts/renesas/r8a77961.dtsi | 12 ++++++++----
arch/arm64/boot/dts/renesas/r8a77965.dtsi | 12 ++++++++----
arch/arm64/boot/dts/renesas/r8a77990.dtsi | 6 ++++--
5 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
index 10b91e9733bf..2adec8b6c93f 100644
--- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
@@ -2778,8 +2778,8 @@ pciec0: pcie@fe000000 {
<0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
<0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
<0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
- /* Map all possible DDR as inbound ranges */
- dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
+ /* Map all possible DDR/IOMMU as inbound ranges */
+ dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
@@ -2790,6 +2790,8 @@ pciec0: pcie@fe000000 {
clock-names = "pcie", "pcie_bus";
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 319>;
+ iommu-map = <0 &ipmmu_hc 0 0x10000>;
+ iommu-map-mask = <0>;
status = "disabled";
};
@@ -2805,8 +2807,8 @@ pciec1: pcie@ee800000 {
<0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
<0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
<0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
- /* Map all possible DDR as inbound ranges */
- dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
+ /* Map all possible DDR/IOMMU as inbound ranges */
+ dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
@@ -2817,6 +2819,8 @@ pciec1: pcie@ee800000 {
clock-names = "pcie", "pcie_bus";
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 318>;
+ iommu-map = <0 &ipmmu_hc 1 0x10000>;
+ iommu-map-mask = <0>;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a77960.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
index 3ea8572e917f..deeb8a8f2bc8 100644
--- a/arch/arm64/boot/dts/renesas/r8a77960.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
@@ -2565,8 +2565,8 @@ pciec0: pcie@fe000000 {
<0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
<0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
<0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
- /* Map all possible DDR as inbound ranges */
- dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
+ /* Map all possible DDR/IOMMU as inbound ranges */
+ dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
@@ -2577,6 +2577,8 @@ pciec0: pcie@fe000000 {
clock-names = "pcie", "pcie_bus";
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
resets = <&cpg 319>;
+ iommu-map = <0 &ipmmu_hc 0 0x10000>;
+ iommu-map-mask = <0>;
status = "disabled";
};
@@ -2592,8 +2594,8 @@ pciec1: pcie@ee800000 {
<0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
<0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
<0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
- /* Map all possible DDR as inbound ranges */
- dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
+ /* Map all possible DDR/IOMMU as inbound ranges */
+ dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
@@ -2604,6 +2606,8 @@ pciec1: pcie@ee800000 {
clock-names = "pcie", "pcie_bus";
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
resets = <&cpg 318>;
+ iommu-map = <0 &ipmmu_hc 1 0x10000>;
+ iommu-map-mask = <0>;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
index d52cb0b67d80..bd84a79333f4 100644
--- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
@@ -2445,8 +2445,8 @@ pciec0: pcie@fe000000 {
<0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
<0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
<0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
- /* Map all possible DDR as inbound ranges */
- dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
+ /* Map all possible DDR/IOMMU as inbound ranges */
+ dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
@@ -2457,6 +2457,8 @@ pciec0: pcie@fe000000 {
clock-names = "pcie", "pcie_bus";
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 319>;
+ iommu-map = <0 &ipmmu_hc 0 0x10000>;
+ iommu-map-mask = <0>;
status = "disabled";
};
@@ -2472,8 +2474,8 @@ pciec1: pcie@ee800000 {
<0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
<0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
<0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
- /* Map all possible DDR as inbound ranges */
- dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
+ /* Map all possible DDR/IOMMU as inbound ranges */
+ dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
@@ -2484,6 +2486,8 @@ pciec1: pcie@ee800000 {
clock-names = "pcie", "pcie_bus";
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 318>;
+ iommu-map = <0 &ipmmu_hc 1 0x10000>;
+ iommu-map-mask = <0>;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
index 9584115c6b17..2319fcd30c47 100644
--- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
@@ -2423,8 +2423,8 @@ pciec0: pcie@fe000000 {
<0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
<0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
<0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
- /* Map all possible DDR as inbound ranges */
- dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
+ /* Map all possible DDR/IOMMU as inbound ranges */
+ dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
@@ -2435,6 +2435,8 @@ pciec0: pcie@fe000000 {
clock-names = "pcie", "pcie_bus";
power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
resets = <&cpg 319>;
+ iommu-map = <0 &ipmmu_hc 0 0x10000>;
+ iommu-map-mask = <0>;
status = "disabled";
};
@@ -2450,8 +2452,8 @@ pciec1: pcie@ee800000 {
<0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
<0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
<0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
- /* Map all possible DDR as inbound ranges */
- dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
+ /* Map all possible DDR/IOMMU as inbound ranges */
+ dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
@@ -2462,6 +2464,8 @@ pciec1: pcie@ee800000 {
clock-names = "pcie", "pcie_bus";
power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
resets = <&cpg 318>;
+ iommu-map = <0 &ipmmu_hc 1 0x10000>;
+ iommu-map-mask = <0>;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
index 4529e9b57c33..61af0e1d3331 100644
--- a/arch/arm64/boot/dts/renesas/r8a77990.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
@@ -1870,8 +1870,8 @@ pciec0: pcie@fe000000 {
<0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
<0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
<0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
- /* Map all possible DDR as inbound ranges */
- dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
+ /* Map all possible DDR/IOMMU as inbound ranges */
+ dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
@@ -1882,6 +1882,8 @@ pciec0: pcie@fe000000 {
clock-names = "pcie", "pcie_bus";
power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
resets = <&cpg 319>;
+ iommu-map = <0 &ipmmu_hc 0 0x10000>;
+ iommu-map-mask = <0>;
status = "disabled";
};
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] arm64: dts: renesas: Add IOMMU related properties into PCIe host nodes
2023-04-26 8:28 [PATCH v2] arm64: dts: renesas: Add IOMMU related properties into PCIe host nodes Yoshihiro Shimoda
@ 2023-05-03 12:38 ` Geert Uytterhoeven
2023-05-04 7:40 ` Manivannan Sadhasivam
2023-05-08 12:02 ` Yoshihiro Shimoda
0 siblings, 2 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2023-05-03 12:38 UTC (permalink / raw)
To: Yoshihiro Shimoda; +Cc: magnus.damm, linux-renesas-soc, linux-pci
Hi Shimoda-san,
CC linux-pci
On Wed, Apr 26, 2023 at 10:28 AM Yoshihiro Shimoda
<yoshihiro.shimoda.uh@renesas.com> wrote:
> Add iommu-map and iommu-map-mask properties into PCIe host nodes.
> Note that iommu-map-mask should be zero because the IPMMU assigns
> one micro TLB ID only to the PCIe host.
>
> Also change dma-ranges arguments for IOMMU. Notes that the dma-ranges
> can be used if IOMMU is disabled.
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Thanks for your patch!
This is not really my area of expertise, but you can still find some
questions and comments below...
> ---
> Changes from v1:
> https://lore.kernel.org/all/20230421122608.3389397-1-yoshihiro.shimoda.uh@renesas.com/
> - Drop iommus property.
> - Add iommu-map-mask property.
> - Revise the commit description.
>
> arch/arm64/boot/dts/renesas/r8a77951.dtsi | 12 ++++++++----
> arch/arm64/boot/dts/renesas/r8a77960.dtsi | 12 ++++++++----
> arch/arm64/boot/dts/renesas/r8a77961.dtsi | 12 ++++++++----
> arch/arm64/boot/dts/renesas/r8a77965.dtsi | 12 ++++++++----
> arch/arm64/boot/dts/renesas/r8a77990.dtsi | 6 ++++--
> 5 files changed, 36 insertions(+), 18 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
> index 10b91e9733bf..2adec8b6c93f 100644
> --- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
> @@ -2778,8 +2778,8 @@ pciec0: pcie@fe000000 {
> <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
> <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
> <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
> - /* Map all possible DDR as inbound ranges */
> - dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
> + /* Map all possible DDR/IOMMU as inbound ranges */
> + dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
So this is limited to the first 4 GiB of DDR (DDR0), i.e. to 32-bit
address space? Shouldn't this include DDR1/2/3?
> interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
> @@ -2790,6 +2790,8 @@ pciec0: pcie@fe000000 {
> clock-names = "pcie", "pcie_bus";
> power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
> resets = <&cpg 319>;
> + iommu-map = <0 &ipmmu_hc 0 0x10000>;
Reading
https://elixir.bootlin.com/linux/latest/source/Documentation/devicetree/bindings/pci/pci-iommu.txt#L35
the above means you map 65536 RIDs n in the range 0..65535
to <&ipmmu_hc n>, while only micro-TLBs 0 and 1 are assigned to PCIe?
Hence I think this should be:
iommu-map = <0 &ipmmu_hc 0 1>;
> + iommu-map-mask = <0>;
> status = "disabled";
> };
>
> @@ -2805,8 +2807,8 @@ pciec1: pcie@ee800000 {
> <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
> <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
> <0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
> - /* Map all possible DDR as inbound ranges */
> - dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
> + /* Map all possible DDR/IOMMU as inbound ranges */
> + dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
Likewise.
> interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
> @@ -2817,6 +2819,8 @@ pciec1: pcie@ee800000 {
> clock-names = "pcie", "pcie_bus";
> power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
> resets = <&cpg 318>;
> + iommu-map = <0 &ipmmu_hc 1 0x10000>;
Likewise, the above means you map 65536 RIDs n in the range 0..65535
to <&ipmmu_hc (1 + n)>?
Hence I think this should be:
iommu-map = <0 &ipmmu_hc 1 1>;
> + iommu-map-mask = <0>;
> status = "disabled";
> };
Same comment for all other changes.
In addition, we need similar changes to r8a774{a1,b1,c0,e1}.dtsi,
and slightly different changes (using ipmmu_vi0 uTLB 5) to r8a77980.dtsi.
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] 5+ messages in thread
* Re: [PATCH v2] arm64: dts: renesas: Add IOMMU related properties into PCIe host nodes
2023-05-03 12:38 ` Geert Uytterhoeven
@ 2023-05-04 7:40 ` Manivannan Sadhasivam
2023-05-08 12:09 ` Yoshihiro Shimoda
2023-05-08 12:02 ` Yoshihiro Shimoda
1 sibling, 1 reply; 5+ messages in thread
From: Manivannan Sadhasivam @ 2023-05-04 7:40 UTC (permalink / raw)
To: Yoshihiro Shimoda
Cc: Yoshihiro Shimoda, magnus.damm, linux-renesas-soc, linux-pci,
Geert Uytterhoeven
On Wed, May 03, 2023 at 02:38:49PM +0200, Geert Uytterhoeven wrote:
> Hi Shimoda-san,
>
> CC linux-pci
>
> On Wed, Apr 26, 2023 at 10:28 AM Yoshihiro Shimoda
> <yoshihiro.shimoda.uh@renesas.com> wrote:
> > Add iommu-map and iommu-map-mask properties into PCIe host nodes.
> > Note that iommu-map-mask should be zero because the IPMMU assigns
> > one micro TLB ID only to the PCIe host.
> >
What do you mean by "only to the PCIe host"? Are you referring to the host
bridge in the SoC?
> > Also change dma-ranges arguments for IOMMU. Notes that the dma-ranges
> > can be used if IOMMU is disabled.
> >
> > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
>
> Thanks for your patch!
>
> This is not really my area of expertise, but you can still find some
> questions and comments below...
>
> > ---
> > Changes from v1:
> > https://lore.kernel.org/all/20230421122608.3389397-1-yoshihiro.shimoda.uh@renesas.com/
> > - Drop iommus property.
> > - Add iommu-map-mask property.
> > - Revise the commit description.
> >
> > arch/arm64/boot/dts/renesas/r8a77951.dtsi | 12 ++++++++----
> > arch/arm64/boot/dts/renesas/r8a77960.dtsi | 12 ++++++++----
> > arch/arm64/boot/dts/renesas/r8a77961.dtsi | 12 ++++++++----
> > arch/arm64/boot/dts/renesas/r8a77965.dtsi | 12 ++++++++----
> > arch/arm64/boot/dts/renesas/r8a77990.dtsi | 6 ++++--
> > 5 files changed, 36 insertions(+), 18 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
> > index 10b91e9733bf..2adec8b6c93f 100644
> > --- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
> > @@ -2778,8 +2778,8 @@ pciec0: pcie@fe000000 {
> > <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
> > <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
> > <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
> > - /* Map all possible DDR as inbound ranges */
> > - dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
> > + /* Map all possible DDR/IOMMU as inbound ranges */
> > + dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
>
> So this is limited to the first 4 GiB of DDR (DDR0), i.e. to 32-bit
> address space? Shouldn't this include DDR1/2/3?
>
> > interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
> > <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
> > <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
> > @@ -2790,6 +2790,8 @@ pciec0: pcie@fe000000 {
> > clock-names = "pcie", "pcie_bus";
> > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
> > resets = <&cpg 319>;
> > + iommu-map = <0 &ipmmu_hc 0 0x10000>;
>
> Reading
> https://elixir.bootlin.com/linux/latest/source/Documentation/devicetree/bindings/pci/pci-iommu.txt#L35
> the above means you map 65536 RIDs n in the range 0..65535
> to <&ipmmu_hc n>, while only micro-TLBs 0 and 1 are assigned to PCIe?
>
> Hence I think this should be:
>
> iommu-map = <0 &ipmmu_hc 0 1>;
>
If there are no PCI-PCI bridges in the SoC, then the devices connected to the
host bridge should share the same bus number i.e., 00:00.0 to 00.1f.8. In that
case, you should have the iommu-map as per Geert's suggestion. Paired with
iommu-map-mask of 0, this implies that all the devices and functions of bus 0
will share the same RID.
This holds true for other instance as well.
- Mani
> > + iommu-map-mask = <0>;
> > status = "disabled";
> > };
> >
> > @@ -2805,8 +2807,8 @@ pciec1: pcie@ee800000 {
> > <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
> > <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
> > <0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
> > - /* Map all possible DDR as inbound ranges */
> > - dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
> > + /* Map all possible DDR/IOMMU as inbound ranges */
> > + dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
>
> Likewise.
>
> > interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
> > <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
> > <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
> > @@ -2817,6 +2819,8 @@ pciec1: pcie@ee800000 {
> > clock-names = "pcie", "pcie_bus";
> > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
> > resets = <&cpg 318>;
> > + iommu-map = <0 &ipmmu_hc 1 0x10000>;
>
> Likewise, the above means you map 65536 RIDs n in the range 0..65535
> to <&ipmmu_hc (1 + n)>?
>
> Hence I think this should be:
>
> iommu-map = <0 &ipmmu_hc 1 1>;
>
> > + iommu-map-mask = <0>;
> > status = "disabled";
> > };
>
> Same comment for all other changes.
>
> In addition, we need similar changes to r8a774{a1,b1,c0,e1}.dtsi,
> and slightly different changes (using ipmmu_vi0 uTLB 5) to r8a77980.dtsi.
>
> 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] 5+ messages in thread
* RE: [PATCH v2] arm64: dts: renesas: Add IOMMU related properties into PCIe host nodes
2023-05-03 12:38 ` Geert Uytterhoeven
2023-05-04 7:40 ` Manivannan Sadhasivam
@ 2023-05-08 12:02 ` Yoshihiro Shimoda
1 sibling, 0 replies; 5+ messages in thread
From: Yoshihiro Shimoda @ 2023-05-08 12:02 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: magnus.damm, linux-renesas-soc, linux-pci
Hi Geert-san,
> From: Geert Uytterhoeven, Sent: Wednesday, May 3, 2023 9:39 PM
>
> Hi Shimoda-san,
>
> CC linux-pci
>
> On Wed, Apr 26, 2023 at 10:28 AM Yoshihiro Shimoda
> <yoshihiro.shimoda.uh@renesas.com> wrote:
> > Add iommu-map and iommu-map-mask properties into PCIe host nodes.
> > Note that iommu-map-mask should be zero because the IPMMU assigns
> > one micro TLB ID only to the PCIe host.
> >
> > Also change dma-ranges arguments for IOMMU. Notes that the dma-ranges
> > can be used if IOMMU is disabled.
> >
> > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
>
> Thanks for your patch!
>
> This is not really my area of expertise, but you can still find some
> questions and comments below...
>
> > ---
> > Changes from v1:
> >
<snip URL>
> > - Drop iommus property.
> > - Add iommu-map-mask property.
> > - Revise the commit description.
> >
> > arch/arm64/boot/dts/renesas/r8a77951.dtsi | 12 ++++++++----
> > arch/arm64/boot/dts/renesas/r8a77960.dtsi | 12 ++++++++----
> > arch/arm64/boot/dts/renesas/r8a77961.dtsi | 12 ++++++++----
> > arch/arm64/boot/dts/renesas/r8a77965.dtsi | 12 ++++++++----
> > arch/arm64/boot/dts/renesas/r8a77990.dtsi | 6 ++++--
> > 5 files changed, 36 insertions(+), 18 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
> > index 10b91e9733bf..2adec8b6c93f 100644
> > --- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
> > @@ -2778,8 +2778,8 @@ pciec0: pcie@fe000000 {
> > <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
> > <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
> > <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
> > - /* Map all possible DDR as inbound ranges */
> > - dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
> > + /* Map all possible DDR/IOMMU as inbound ranges */
> > + dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
>
> So this is limited to the first 4 GiB of DDR (DDR0), i.e. to 32-bit
> address space? Shouldn't this include DDR1/2/3?
This controller can access within 32-bit address space only. So, we cannot include
DDR1/2/3.
> > interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
> > <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
> > <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
> > @@ -2790,6 +2790,8 @@ pciec0: pcie@fe000000 {
> > clock-names = "pcie", "pcie_bus";
> > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
> > resets = <&cpg 319>;
> > + iommu-map = <0 &ipmmu_hc 0 0x10000>;
>
> Reading
<snip URL>
> the above means you map 65536 RIDs n in the range 0..65535
> to <&ipmmu_hc n>, while only micro-TLBs 0 and 1 are assigned to PCIe?
Yes. pciec0's ID is 0, and pciec1's ID is 1.
> Hence I think this should be:
>
> iommu-map = <0 &ipmmu_hc 0 1>;
I got it.
> > + iommu-map-mask = <0>;
> > status = "disabled";
> > };
> >
> > @@ -2805,8 +2807,8 @@ pciec1: pcie@ee800000 {
> > <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
> > <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
> > <0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
> > - /* Map all possible DDR as inbound ranges */
> > - dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
> > + /* Map all possible DDR/IOMMU as inbound ranges */
> > + dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
>
> Likewise.
>
> > interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
> > <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
> > <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
> > @@ -2817,6 +2819,8 @@ pciec1: pcie@ee800000 {
> > clock-names = "pcie", "pcie_bus";
> > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
> > resets = <&cpg 318>;
> > + iommu-map = <0 &ipmmu_hc 1 0x10000>;
>
> Likewise, the above means you map 65536 RIDs n in the range 0..65535
> to <&ipmmu_hc (1 + n)>?
>
> Hence I think this should be:
>
> iommu-map = <0 &ipmmu_hc 1 1>;
I got it.
> > + iommu-map-mask = <0>;
> > status = "disabled";
> > };
>
> Same comment for all other changes.
I'll fix all files.
> In addition, we need similar changes to r8a774{a1,b1,c0,e1}.dtsi,
> and slightly different changes (using ipmmu_vi0 uTLB 5) to r8a77980.dtsi.
I got it. I also modify these files.
Best regards,
Yoshihiro Shimoda
> 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] 5+ messages in thread
* RE: [PATCH v2] arm64: dts: renesas: Add IOMMU related properties into PCIe host nodes
2023-05-04 7:40 ` Manivannan Sadhasivam
@ 2023-05-08 12:09 ` Yoshihiro Shimoda
0 siblings, 0 replies; 5+ messages in thread
From: Yoshihiro Shimoda @ 2023-05-08 12:09 UTC (permalink / raw)
To: Manivannan Sadhasivam
Cc: magnus.damm, linux-renesas-soc, linux-pci, Geert Uytterhoeven
Hi Manivannan,
> From: Manivannan Sadhasivam, Sent: Thursday, May 4, 2023 4:40 PM
>
> On Wed, May 03, 2023 at 02:38:49PM +0200, Geert Uytterhoeven wrote:
> > Hi Shimoda-san,
> >
> > CC linux-pci
> >
> > On Wed, Apr 26, 2023 at 10:28 AM Yoshihiro Shimoda
> > <yoshihiro.shimoda.uh@renesas.com> wrote:
> > > Add iommu-map and iommu-map-mask properties into PCIe host nodes.
> > > Note that iommu-map-mask should be zero because the IPMMU assigns
> > > one micro TLB ID only to the PCIe host.
> > >
>
> What do you mean by "only to the PCIe host"? Are you referring to the host
> bridge in the SoC?
Oops. I intended to mean "one micro TLB ID only". The SoC doesn't have
any host bridge. So, I should have mentioned that "the IPMMU assigns one micro
TLB ID only, to the PCIe host.".
> > > Also change dma-ranges arguments for IOMMU. Notes that the dma-ranges
> > > can be used if IOMMU is disabled.
> > >
> > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> >
> > Thanks for your patch!
> >
> > This is not really my area of expertise, but you can still find some
> > questions and comments below...
> >
> > > ---
> > > Changes from v1:
> > >
<snip URL>
> > > - Drop iommus property.
> > > - Add iommu-map-mask property.
> > > - Revise the commit description.
> > >
> > > arch/arm64/boot/dts/renesas/r8a77951.dtsi | 12 ++++++++----
> > > arch/arm64/boot/dts/renesas/r8a77960.dtsi | 12 ++++++++----
> > > arch/arm64/boot/dts/renesas/r8a77961.dtsi | 12 ++++++++----
> > > arch/arm64/boot/dts/renesas/r8a77965.dtsi | 12 ++++++++----
> > > arch/arm64/boot/dts/renesas/r8a77990.dtsi | 6 ++++--
> > > 5 files changed, 36 insertions(+), 18 deletions(-)
> > >
> > > diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
> > > index 10b91e9733bf..2adec8b6c93f 100644
> > > --- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
> > > +++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
> > > @@ -2778,8 +2778,8 @@ pciec0: pcie@fe000000 {
> > > <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
> > > <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
> > > <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
> > > - /* Map all possible DDR as inbound ranges */
> > > - dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
> > > + /* Map all possible DDR/IOMMU as inbound ranges */
> > > + dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
> >
> > So this is limited to the first 4 GiB of DDR (DDR0), i.e. to 32-bit
> > address space? Shouldn't this include DDR1/2/3?
> >
> > > interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
> > > <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
> > > <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
> > > @@ -2790,6 +2790,8 @@ pciec0: pcie@fe000000 {
> > > clock-names = "pcie", "pcie_bus";
> > > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
> > > resets = <&cpg 319>;
> > > + iommu-map = <0 &ipmmu_hc 0 0x10000>;
> >
> > Reading
> >
<snip URL>
> > the above means you map 65536 RIDs n in the range 0..65535
> > to <&ipmmu_hc n>, while only micro-TLBs 0 and 1 are assigned to PCIe?
> >
> > Hence I think this should be:
> >
> > iommu-map = <0 &ipmmu_hc 0 1>;
> >
>
> If there are no PCI-PCI bridges in the SoC, then the devices connected to the
> host bridge should share the same bus number i.e., 00:00.0 to 00.1f.8. In that
> case, you should have the iommu-map as per Geert's suggestion. Paired with
> iommu-map-mask of 0, this implies that all the devices and functions of bus 0
> will share the same RID.
>
> This holds true for other instance as well.
Thank you for the comments. I'll fix this patch.
Best regards,
Yoshihiro Shimoda
> - Mani
>
> > > + iommu-map-mask = <0>;
> > > status = "disabled";
> > > };
> > >
> > > @@ -2805,8 +2807,8 @@ pciec1: pcie@ee800000 {
> > > <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
> > > <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
> > > <0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
> > > - /* Map all possible DDR as inbound ranges */
> > > - dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
> > > + /* Map all possible DDR/IOMMU as inbound ranges */
> > > + dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
> >
> > Likewise.
> >
> > > interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
> > > <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
> > > <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
> > > @@ -2817,6 +2819,8 @@ pciec1: pcie@ee800000 {
> > > clock-names = "pcie", "pcie_bus";
> > > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
> > > resets = <&cpg 318>;
> > > + iommu-map = <0 &ipmmu_hc 1 0x10000>;
> >
> > Likewise, the above means you map 65536 RIDs n in the range 0..65535
> > to <&ipmmu_hc (1 + n)>?
> >
> > Hence I think this should be:
> >
> > iommu-map = <0 &ipmmu_hc 1 1>;
> >
> > > + iommu-map-mask = <0>;
> > > status = "disabled";
> > > };
> >
> > Same comment for all other changes.
> >
> > In addition, we need similar changes to r8a774{a1,b1,c0,e1}.dtsi,
> > and slightly different changes (using ipmmu_vi0 uTLB 5) to r8a77980.dtsi.
> >
> > 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] 5+ messages in thread
end of thread, other threads:[~2023-05-08 12:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-26 8:28 [PATCH v2] arm64: dts: renesas: Add IOMMU related properties into PCIe host nodes Yoshihiro Shimoda
2023-05-03 12:38 ` Geert Uytterhoeven
2023-05-04 7:40 ` Manivannan Sadhasivam
2023-05-08 12:09 ` Yoshihiro Shimoda
2023-05-08 12:02 ` Yoshihiro Shimoda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).