* [PATCH v3 1/2] dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779f0 support
2022-02-08 0:20 [PATCH v3 0/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4 Yoshihiro Shimoda
@ 2022-02-08 0:20 ` Yoshihiro Shimoda
2022-02-09 18:58 ` Rob Herring
2022-02-08 0:20 ` [PATCH v3 2/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4 Yoshihiro Shimoda
2022-02-14 13:00 ` [PATCH v3 0/2] " Joerg Roedel
2 siblings, 1 reply; 5+ messages in thread
From: Yoshihiro Shimoda @ 2022-02-08 0:20 UTC (permalink / raw)
To: joro, will, robh+dt
Cc: iommu, devicetree, linux-renesas-soc, Yoshihiro Shimoda,
Geert Uytterhoeven
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>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
.../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] 5+ messages in thread* [PATCH v3 2/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4
2022-02-08 0:20 [PATCH v3 0/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4 Yoshihiro Shimoda
2022-02-08 0:20 ` [PATCH v3 1/2] dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779f0 support Yoshihiro Shimoda
@ 2022-02-08 0:20 ` Yoshihiro Shimoda
2022-02-14 13:00 ` [PATCH v3 0/2] " Joerg Roedel
2 siblings, 0 replies; 5+ messages in thread
From: Yoshihiro Shimoda @ 2022-02-08 0:20 UTC (permalink / raw)
To: joro, will, robh+dt
Cc: iommu, devicetree, linux-renesas-soc, Yoshihiro Shimoda,
Geert Uytterhoeven
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>
---
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] 5+ messages in thread* Re: [PATCH v3 0/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4
2022-02-08 0:20 [PATCH v3 0/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4 Yoshihiro Shimoda
2022-02-08 0:20 ` [PATCH v3 1/2] dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779f0 support Yoshihiro Shimoda
2022-02-08 0:20 ` [PATCH v3 2/2] iommu/ipmmu-vmsa: Add support for R-Car Gen4 Yoshihiro Shimoda
@ 2022-02-14 13:00 ` Joerg Roedel
2 siblings, 0 replies; 5+ messages in thread
From: Joerg Roedel @ 2022-02-14 13:00 UTC (permalink / raw)
To: Yoshihiro Shimoda; +Cc: will, robh+dt, iommu, devicetree, linux-renesas-soc
On Tue, Feb 08, 2022 at 09:20:28AM +0900, Yoshihiro Shimoda wrote:
> 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 v2:
> - Add Reviewed-by tag in patch 1 and 2 (Geert-san, thanks!)
> - Revise commit description in patch 1.
> https://lore.kernel.org/all/20220204125653.1194249-1-yoshihiro.shimoda.uh@renesas.com/
>
> 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/
>
> Y
>
> Yoshihiro Shimoda (2):
> dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779f0 support
> iommu/ipmmu-vmsa: Add support for R-Car Gen4
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread