[PATCH 0/2] iommu/ipmmu-vmsa: r8a779(70|95) support

[PATCH 0/2] iommu/ipmmu-vmsa: r8a779(70|95) support

[Simon Horman]

Update Update the IPMMU DT binding documentation and driver implementation
to support the r8a77970 (R-Car V3M) and r8a77995 (R-Car D3).

Based on work for r8a7796 by Magnus Damm.

Patches based on:
* iommu/next
* [PATCH v5 00/09] iommu/ipmmu-vmsa: r8a7795 support V5
* [PATCH v4 0/3] iommu/ipmmu-vmsa: r8a7796 support V4
  (fuzz when applying 3/3)

Simon Horman (2):
  iommu/ipmmu-vmsa: Add r8a779(70|95) DT bindings
  iommu/ipmmu-vmsa: Hook up r8a779(70|95) DT matching code

 .../devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt         |  2 ++
 drivers/iommu/ipmmu-vmsa.c                                   | 12 ++++++++++++
 2 files changed, 14 insertions(+)

-- 
2.11.0

[PATCH 1/2] iommu/ipmmu-vmsa: Add r8a779(70|95) DT bindings

[Simon Horman]

Update the IPMMU DT binding documentation to include the
r8a77970 (R-Car V3M) and r8a77995 (R-Car D3) compat strings.

Based on work for r8a7796 by Magnus Damm.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt
index 98ae900a7a76..9efa87dbcfdc 100644
--- a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt
+++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt
@@ -17,6 +17,8 @@ Required Properties:
     - "renesas,ipmmu-r8a7794" for the R8A7794 (R-Car E2) IPMMU.
     - "renesas,ipmmu-r8a7795" for the R8A7795 (R-Car H3) IPMMU.
     - "renesas,ipmmu-r8a7796" for the R8A7796 (R-Car M3-W) IPMMU.
+    - "renesas,ipmmu-r8a77970" for the R8A7770 (R-Car V3M) IPMMU.
+    - "renesas,ipmmu-r8a77995" for the R8A77995 (R-Car D3) IPMMU.
     - "renesas,ipmmu-vmsa" for generic R-Car Gen2 VMSA-compatible IPMMU.
 
   - reg: Base address and size of the IPMMU registers.
-- 
2.11.0

[PATCH 2/2] iommu/ipmmu-vmsa: Hook up r8a779(70|95) DT matching code

[Simon Horman]

Support the r8a77970 (R-Car V3M) and r8a77995 (R-Car D3) IPMMUs by sharing
feature flags with r8a7795 (R-Car H3) and r8a7796 (R-Car M3-W). Also update
IOMMU_OF_DECLARE to hook up the compat strings.

Based on work for the r8a7796 by Magnus Damm

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 drivers/iommu/ipmmu-vmsa.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index 02989bb060cc..c22520a453ff 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -749,6 +749,8 @@ static bool ipmmu_slave_whitelist(struct device *dev)
 static const struct soc_device_attribute soc_rcar_gen3[] = {
 	{ .soc_id = "r8a7795", },
 	{ .soc_id = "r8a7796", },
+	{ .soc_id = "r8a77970", },
+	{ .soc_id = "r8a77995", },
 	{ /* sentinel */ }
 };
 
@@ -1036,6 +1038,12 @@ static const struct of_device_id ipmmu_of_ids[] = {
 		.compatible = "renesas,ipmmu-r8a7796",
 		.data = &ipmmu_features_rcar_gen3,
 	}, {
+		.compatible = "renesas,ipmmu-r8a77970",
+		.data = &ipmmu_features_rcar_gen3,
+	}, {
+		.compatible = "renesas,ipmmu-r8a77995",
+		.data = &ipmmu_features_rcar_gen3,
+	}, {
 		/* Terminator */
 	},
 };
@@ -1224,6 +1232,10 @@ IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795",
 		 ipmmu_vmsa_iommu_of_setup);
 IOMMU_OF_DECLARE(ipmmu_r8a7796_iommu_of, "renesas,ipmmu-r8a7796",
 		 ipmmu_vmsa_iommu_of_setup);
+IOMMU_OF_DECLARE(ipmmu_r8a77970_iommu_of, "renesas,ipmmu-r8a77970",
+		 ipmmu_vmsa_iommu_of_setup);
+IOMMU_OF_DECLARE(ipmmu_r8a77995_iommu_of, "renesas,ipmmu-r8a77995",
+		 ipmmu_vmsa_iommu_of_setup);
 #endif
 
 MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");
-- 
2.11.0

Re: [PATCH 0/2] iommu/ipmmu-vmsa: r8a779(70|95) support

[Alex Williamson]

On Wed,  1 Nov 2017 11:34:21 +0100
Simon Horman <horms+renesas@verge.net.au> wrote:

> Update Update the IPMMU DT binding documentation and driver implementation
> to support the r8a77970 (R-Car V3M) and r8a77995 (R-Car D3).
> 
> Based on work for r8a7796 by Magnus Damm.
> 
> Patches based on:
> * iommu/next
> * [PATCH v5 00/09] iommu/ipmmu-vmsa: r8a7795 support V5
> * [PATCH v4 0/3] iommu/ipmmu-vmsa: r8a7796 support V4
>   (fuzz when applying 3/3)

This last dependent patch series hasn't had any comments or updates
since June.  Do I take it from Simon's new patches here that it's still
relevant and desired?  Perhaps it was simply missed and nobody bothered
to re-send it?  Thanks,

Alex

 
> Simon Horman (2):
>   iommu/ipmmu-vmsa: Add r8a779(70|95) DT bindings
>   iommu/ipmmu-vmsa: Hook up r8a779(70|95) DT matching code
> 
>  .../devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt         |  2 ++
>  drivers/iommu/ipmmu-vmsa.c                                   | 12 ++++++++++++
>  2 files changed, 14 insertions(+)
> 

Re: [PATCH 1/2] iommu/ipmmu-vmsa: Add r8a779(70|95) DT bindings

[Geert Uytterhoeven]

On Wed, Nov 1, 2017 at 11:34 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> Update the IPMMU DT binding documentation to include the
> r8a77970 (R-Car V3M) and r8a77995 (R-Car D3) compat strings.
>
> Based on work for r8a7796 by Magnus Damm.
>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

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

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 2/2] iommu/ipmmu-vmsa: Hook up r8a779(70|95) DT matching code

[Geert Uytterhoeven]

On Wed, Nov 1, 2017 at 11:34 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> Support the r8a77970 (R-Car V3M) and r8a77995 (R-Car D3) IPMMUs by sharing
> feature flags with r8a7795 (R-Car H3) and r8a7796 (R-Car M3-W). Also update
> IOMMU_OF_DECLARE to hook up the compat strings.
>
> Based on work for the r8a7796 by Magnus Damm
>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

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

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 0/2] iommu/ipmmu-vmsa: r8a779(70|95) support

[Simon Horman]

On Mon, Nov 06, 2017 at 12:22:01PM -0700, Alex Williamson wrote:
> On Wed,  1 Nov 2017 11:34:21 +0100
> Simon Horman <horms+renesas@verge.net.au> wrote:
> 
> > Update Update the IPMMU DT binding documentation and driver implementation
> > to support the r8a77970 (R-Car V3M) and r8a77995 (R-Car D3).
> > 
> > Based on work for r8a7796 by Magnus Damm.
> > 
> > Patches based on:
> > * iommu/next
> > * [PATCH v5 00/09] iommu/ipmmu-vmsa: r8a7795 support V5
> > * [PATCH v4 0/3] iommu/ipmmu-vmsa: r8a7796 support V4
> >   (fuzz when applying 3/3)
> 
> This last dependent patch series hasn't had any comments or updates
> since June.  Do I take it from Simon's new patches here that it's still
> relevant and desired?  Perhaps it was simply missed and nobody bothered
> to re-send it?  Thanks,

Hi Alex,

I spoke with Magnus about this and we feel that its a little early
to merge the driver portion of both "[PATCH v4 0/3] iommu/ipmmu-vmsa:
r8a7796 support V4" and this patchset.

We would, however, like to see the bindings updates merged as they seem
ready. I will repost them separately as that should be easiest for you.