linux-renesas-soc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4
@ 2022-02-04 12:56 Yoshihiro Shimoda
  2022-02-04 12:56 ` [PATCH v2 1/2] dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779f0 support Yoshihiro Shimoda
  2022-02-04 12:56 ` [PATCH v2 2/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4 Yoshihiro Shimoda
  0 siblings, 2 replies; 6+ messages in thread
From: Yoshihiro Shimoda @ 2022-02-04 12:56 UTC (permalink / raw)
  To: joro, will, robh+dt
  Cc: iommu, devicetree, linux-renesas-soc, Yoshihiro Shimoda

This patch series is based on renesas-drivers-2022-01-11-v5.16 [1].
Note that we have to prepare the following registers' setting
in a bootloader (U-Boot) because the registers are protected.
Otherwise, data mismatch happened if dmatest with the ipmmu is running.

 => mw eed01500 0xc0000000; mw eed41500 0xc0000000

[1]
https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git/tag/?h=renesas-drivers-2022-01-11-v5.16

Changes from v1:
 - Add Reviewed-by tag in patch 1. (Geert-san, thanks!)
 - Revise a comment in patch 2.
 https://lore.kernel.org/all/20220125125602.4144793-1-yoshihiro.shimoda.uh@renesas.com/

Yoshihiro Shimoda (2):
  dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779f0 support
  iommu/ipmmu-vmsa: Add support for R-Car Gen4

 .../devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml  |  4 ++++
 drivers/iommu/ipmmu-vmsa.c                             | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

-- 
2.25.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2 1/2] dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779f0 support
  2022-02-04 12:56 [PATCH v2 0/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4 Yoshihiro Shimoda
@ 2022-02-04 12:56 ` Yoshihiro Shimoda
  2022-02-07 14:26   ` Geert Uytterhoeven
  2022-02-04 12:56 ` [PATCH v2 2/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4 Yoshihiro Shimoda
  1 sibling, 1 reply; 6+ messages in thread
From: Yoshihiro Shimoda @ 2022-02-04 12:56 UTC (permalink / raw)
  To: joro, will, robh+dt
  Cc: iommu, devicetree, linux-renesas-soc, Yoshihiro Shimoda

Document the compatible values for the IPMMU-VMSA blocks in
the Renesas R-Car S4-8 (R8A779F0) SoC and R-Car Gen4.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
3fbefb9570325500dbf3faff80ded6d0d46f48b2
---
 .../devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml
index ce0c715205c6..5159a87f3fa7 100644
--- a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml
+++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml
@@ -44,6 +44,10 @@ properties:
               - renesas,ipmmu-r8a77990 # R-Car E3
               - renesas,ipmmu-r8a77995 # R-Car D3
               - renesas,ipmmu-r8a779a0 # R-Car V3U
+      - items:
+          - enum:
+              - renesas,ipmmu-r8a779f0 # R-Car S4-8
+          - const: renesas,rcar-gen4-ipmmu-vmsa  # R-Car Gen4
 
   reg:
     maxItems: 1
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v2 2/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4
  2022-02-04 12:56 [PATCH v2 0/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4 Yoshihiro Shimoda
  2022-02-04 12:56 ` [PATCH v2 1/2] dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779f0 support Yoshihiro Shimoda
@ 2022-02-04 12:56 ` Yoshihiro Shimoda
  2022-02-07 14:27   ` Geert Uytterhoeven
  1 sibling, 1 reply; 6+ messages in thread
From: Yoshihiro Shimoda @ 2022-02-04 12:56 UTC (permalink / raw)
  To: joro, will, robh+dt
  Cc: iommu, devicetree, linux-renesas-soc, Yoshihiro Shimoda

Add support for R-Car Gen4 like r8a779f0 (R-Car S4-8). The IPMMU
hardware design of r8a779f0 is the same as r8a779a0. So, rename
"r8a779a0" to "rcar_gen4".

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 drivers/iommu/ipmmu-vmsa.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index ca752bdc710f..0f7e975546e9 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -719,6 +719,7 @@ static int ipmmu_init_platform_device(struct device *dev,
 
 static const struct soc_device_attribute soc_needs_opt_in[] = {
 	{ .family = "R-Car Gen3", },
+	{ .family = "R-Car Gen4", },
 	{ .family = "RZ/G2", },
 	{ /* sentinel */ }
 };
@@ -743,7 +744,7 @@ static bool ipmmu_device_is_allowed(struct device *dev)
 	unsigned int i;
 
 	/*
-	 * R-Car Gen3 and RZ/G2 use the allow list to opt-in devices.
+	 * R-Car Gen3/4 and RZ/G2 use the allow list to opt-in devices.
 	 * For Other SoCs, this returns true anyway.
 	 */
 	if (!soc_device_match(soc_needs_opt_in))
@@ -926,7 +927,7 @@ static const struct ipmmu_features ipmmu_features_rcar_gen3 = {
 	.utlb_offset_base = 0,
 };
 
-static const struct ipmmu_features ipmmu_features_r8a779a0 = {
+static const struct ipmmu_features ipmmu_features_rcar_gen4 = {
 	.use_ns_alias_offset = false,
 	.has_cache_leaf_nodes = true,
 	.number_of_contexts = 16,
@@ -982,7 +983,10 @@ static const struct of_device_id ipmmu_of_ids[] = {
 		.data = &ipmmu_features_rcar_gen3,
 	}, {
 		.compatible = "renesas,ipmmu-r8a779a0",
-		.data = &ipmmu_features_r8a779a0,
+		.data = &ipmmu_features_rcar_gen4,
+	}, {
+		.compatible = "renesas,rcar-gen4-ipmmu",
+		.data = &ipmmu_features_rcar_gen4,
 	}, {
 		/* Terminator */
 	},
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 1/2] dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779f0 support
  2022-02-04 12:56 ` [PATCH v2 1/2] dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779f0 support Yoshihiro Shimoda
@ 2022-02-07 14:26   ` Geert Uytterhoeven
  2022-02-08  0:02     ` Yoshihiro Shimoda
  0 siblings, 1 reply; 6+ messages in thread
From: Geert Uytterhoeven @ 2022-02-07 14:26 UTC (permalink / raw)
  To: Yoshihiro Shimoda
  Cc: Joerg Roedel, Will Deacon, Rob Herring, Linux IOMMU,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	Linux-Renesas

On Fri, Feb 4, 2022 at 2:54 PM Yoshihiro Shimoda
<yoshihiro.shimoda.uh@renesas.com> wrote:
> Document the compatible values for the IPMMU-VMSA blocks in
> the Renesas R-Car S4-8 (R8A779F0) SoC and R-Car Gen4.
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> 3fbefb9570325500dbf3faff80ded6d0d46f48b2

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] 6+ messages in thread

* Re: [PATCH v2 2/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4
  2022-02-04 12:56 ` [PATCH v2 2/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4 Yoshihiro Shimoda
@ 2022-02-07 14:27   ` Geert Uytterhoeven
  0 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2022-02-07 14:27 UTC (permalink / raw)
  To: Yoshihiro Shimoda
  Cc: Joerg Roedel, Will Deacon, Rob Herring, Linux IOMMU,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	Linux-Renesas

On Fri, Feb 4, 2022 at 4:49 PM Yoshihiro Shimoda
<yoshihiro.shimoda.uh@renesas.com> wrote:
> Add support for R-Car Gen4 like r8a779f0 (R-Car S4-8). The IPMMU
> hardware design of r8a779f0 is the same as r8a779a0. So, rename
> "r8a779a0" to "rcar_gen4".
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

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] 6+ messages in thread

* RE: [PATCH v2 1/2] dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779f0 support
  2022-02-07 14:26   ` Geert Uytterhoeven
@ 2022-02-08  0:02     ` Yoshihiro Shimoda
  0 siblings, 0 replies; 6+ messages in thread
From: Yoshihiro Shimoda @ 2022-02-08  0:02 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Joerg Roedel, Will Deacon, Rob Herring, Linux IOMMU,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	Linux-Renesas

Hi Geert-san,

> From: Geert Uytterhoeven, Sent: Monday, February 7, 2022 11:26 PM
> 
> On Fri, Feb 4, 2022 at 2:54 PM Yoshihiro Shimoda
> <yoshihiro.shimoda.uh@renesas.com> wrote:
> > Document the compatible values for the IPMMU-VMSA blocks in
> > the Renesas R-Car S4-8 (R8A779F0) SoC and R-Car Gen4.
> >
> > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > 3fbefb9570325500dbf3faff80ded6d0d46f48b2

Oops! I completely mistook adding a strange hash here...
I intended to add Geert-san's Reviewed-by here...

> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thank you for your review again! I'll resend v3 patch.

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] 6+ messages in thread

end of thread, other threads:[~2022-02-08  1:06 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-04 12:56 [PATCH v2 0/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4 Yoshihiro Shimoda
2022-02-04 12:56 ` [PATCH v2 1/2] dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779f0 support Yoshihiro Shimoda
2022-02-07 14:26   ` Geert Uytterhoeven
2022-02-08  0:02     ` Yoshihiro Shimoda
2022-02-04 12:56 ` [PATCH v2 2/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4 Yoshihiro Shimoda
2022-02-07 14:27   ` Geert Uytterhoeven

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).