* [PATCH v2 0/2] iommu/ipmmu-vmsa: Add support for r8a779a0
@ 2021-09-07 8:30 ` Yoshihiro Shimoda
0 siblings, 0 replies; 10+ messages in thread
From: Yoshihiro Shimoda @ 2021-09-07 8:30 UTC (permalink / raw)
To: joro, will, robh+dt; +Cc: linux-renesas-soc, devicetree, iommu
This patch series adds support for r8a779a0 (R-Car V3U).
Changes from v1:
- Add {Ack,Review}ed-by in the patch 1.
- Add support 16 contexts in the patch 2.
- Add Reviewed-by in the patch 2.
https://lore.kernel.org/all/20210901102705.556093-1-yoshihiro.shimoda.uh@renesas.com/
Yoshihiro Shimoda (2):
dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779a0 support
iommu/ipmmu-vmsa: Add support for r8a779a0
.../bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 +
drivers/iommu/ipmmu-vmsa.c | 29 ++++++++++++++++---
2 files changed, 26 insertions(+), 4 deletions(-)
--
2.25.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v2 1/2] dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779a0 support
2021-09-07 8:30 ` Yoshihiro Shimoda
@ 2021-09-07 8:30 ` Yoshihiro Shimoda
-1 siblings, 0 replies; 10+ messages in thread
From: Yoshihiro Shimoda @ 2021-09-07 8:30 UTC (permalink / raw)
To: joro, will, robh+dt
Cc: iommu, devicetree, linux-renesas-soc, Yoshihiro Shimoda,
Rob Herring, Geert Uytterhoeven
Add support for r8a779a0 (R-Car V3U).
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml
index 02c69a95c332..ce0c715205c6 100644
--- a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml
+++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml
@@ -43,6 +43,7 @@ properties:
- renesas,ipmmu-r8a77980 # R-Car V3H
- renesas,ipmmu-r8a77990 # R-Car E3
- renesas,ipmmu-r8a77995 # R-Car D3
+ - renesas,ipmmu-r8a779a0 # R-Car V3U
reg:
maxItems: 1
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 1/2] dt-bindings: iommu: renesas, ipmmu-vmsa: add r8a779a0 support
@ 2021-09-07 8:30 ` Yoshihiro Shimoda
0 siblings, 0 replies; 10+ messages in thread
From: Yoshihiro Shimoda @ 2021-09-07 8:30 UTC (permalink / raw)
To: joro, will, robh+dt
Cc: devicetree, Geert Uytterhoeven, Rob Herring, linux-renesas-soc, iommu
Add support for r8a779a0 (R-Car V3U).
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml
index 02c69a95c332..ce0c715205c6 100644
--- a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml
+++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml
@@ -43,6 +43,7 @@ properties:
- renesas,ipmmu-r8a77980 # R-Car V3H
- renesas,ipmmu-r8a77990 # R-Car E3
- renesas,ipmmu-r8a77995 # R-Car D3
+ - renesas,ipmmu-r8a779a0 # R-Car V3U
reg:
maxItems: 1
--
2.25.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/2] iommu/ipmmu-vmsa: Add support for r8a779a0
2021-09-07 8:30 ` Yoshihiro Shimoda
@ 2021-09-07 8:30 ` Yoshihiro Shimoda
-1 siblings, 0 replies; 10+ messages in thread
From: Yoshihiro Shimoda @ 2021-09-07 8:30 UTC (permalink / raw)
To: joro, will, robh+dt
Cc: iommu, devicetree, linux-renesas-soc, Yoshihiro Shimoda,
Geert Uytterhoeven
Add support for r8a779a0 (R-Car V3U). The IPMMU hardware design
of this SoC differs than others. So, add a new ipmmu_features for it.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/iommu/ipmmu-vmsa.c | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index d38ff29a76e8..d8fe5ba0cb23 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -33,10 +33,10 @@
#define arm_iommu_detach_device(...) do {} while (0)
#endif
-#define IPMMU_CTX_MAX 8U
+#define IPMMU_CTX_MAX 16U
#define IPMMU_CTX_INVALID -1
-#define IPMMU_UTLB_MAX 48U
+#define IPMMU_UTLB_MAX 64U
struct ipmmu_features {
bool use_ns_alias_offset;
@@ -189,8 +189,12 @@ static void ipmmu_write(struct ipmmu_vmsa_device *mmu, unsigned int offset,
static unsigned int ipmmu_ctx_reg(struct ipmmu_vmsa_device *mmu,
unsigned int context_id, unsigned int reg)
{
- return mmu->features->ctx_offset_base +
- context_id * mmu->features->ctx_offset_stride + reg;
+ unsigned int base = mmu->features->ctx_offset_base;
+
+ if (context_id > 7)
+ base += 0x800 - 8 * 0x40;
+
+ return base + context_id * mmu->features->ctx_offset_stride + reg;
}
static u32 ipmmu_ctx_read(struct ipmmu_vmsa_device *mmu,
@@ -922,6 +926,20 @@ static const struct ipmmu_features ipmmu_features_rcar_gen3 = {
.utlb_offset_base = 0,
};
+static const struct ipmmu_features ipmmu_features_r8a779a0 = {
+ .use_ns_alias_offset = false,
+ .has_cache_leaf_nodes = true,
+ .number_of_contexts = 16,
+ .num_utlbs = 64,
+ .setup_imbuscr = false,
+ .twobit_imttbcr_sl0 = true,
+ .reserved_context = true,
+ .cache_snoop = false,
+ .ctx_offset_base = 0x10000,
+ .ctx_offset_stride = 0x1040,
+ .utlb_offset_base = 0x3000,
+};
+
static const struct of_device_id ipmmu_of_ids[] = {
{
.compatible = "renesas,ipmmu-vmsa",
@@ -959,6 +977,9 @@ static const struct of_device_id ipmmu_of_ids[] = {
}, {
.compatible = "renesas,ipmmu-r8a77995",
.data = &ipmmu_features_rcar_gen3,
+ }, {
+ .compatible = "renesas,ipmmu-r8a779a0",
+ .data = &ipmmu_features_r8a779a0,
}, {
/* Terminator */
},
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 2/2] iommu/ipmmu-vmsa: Add support for r8a779a0
@ 2021-09-07 8:30 ` Yoshihiro Shimoda
0 siblings, 0 replies; 10+ messages in thread
From: Yoshihiro Shimoda @ 2021-09-07 8:30 UTC (permalink / raw)
To: joro, will, robh+dt
Cc: linux-renesas-soc, devicetree, iommu, Geert Uytterhoeven
Add support for r8a779a0 (R-Car V3U). The IPMMU hardware design
of this SoC differs than others. So, add a new ipmmu_features for it.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/iommu/ipmmu-vmsa.c | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index d38ff29a76e8..d8fe5ba0cb23 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -33,10 +33,10 @@
#define arm_iommu_detach_device(...) do {} while (0)
#endif
-#define IPMMU_CTX_MAX 8U
+#define IPMMU_CTX_MAX 16U
#define IPMMU_CTX_INVALID -1
-#define IPMMU_UTLB_MAX 48U
+#define IPMMU_UTLB_MAX 64U
struct ipmmu_features {
bool use_ns_alias_offset;
@@ -189,8 +189,12 @@ static void ipmmu_write(struct ipmmu_vmsa_device *mmu, unsigned int offset,
static unsigned int ipmmu_ctx_reg(struct ipmmu_vmsa_device *mmu,
unsigned int context_id, unsigned int reg)
{
- return mmu->features->ctx_offset_base +
- context_id * mmu->features->ctx_offset_stride + reg;
+ unsigned int base = mmu->features->ctx_offset_base;
+
+ if (context_id > 7)
+ base += 0x800 - 8 * 0x40;
+
+ return base + context_id * mmu->features->ctx_offset_stride + reg;
}
static u32 ipmmu_ctx_read(struct ipmmu_vmsa_device *mmu,
@@ -922,6 +926,20 @@ static const struct ipmmu_features ipmmu_features_rcar_gen3 = {
.utlb_offset_base = 0,
};
+static const struct ipmmu_features ipmmu_features_r8a779a0 = {
+ .use_ns_alias_offset = false,
+ .has_cache_leaf_nodes = true,
+ .number_of_contexts = 16,
+ .num_utlbs = 64,
+ .setup_imbuscr = false,
+ .twobit_imttbcr_sl0 = true,
+ .reserved_context = true,
+ .cache_snoop = false,
+ .ctx_offset_base = 0x10000,
+ .ctx_offset_stride = 0x1040,
+ .utlb_offset_base = 0x3000,
+};
+
static const struct of_device_id ipmmu_of_ids[] = {
{
.compatible = "renesas,ipmmu-vmsa",
@@ -959,6 +977,9 @@ static const struct of_device_id ipmmu_of_ids[] = {
}, {
.compatible = "renesas,ipmmu-r8a77995",
.data = &ipmmu_features_rcar_gen3,
+ }, {
+ .compatible = "renesas,ipmmu-r8a779a0",
+ .data = &ipmmu_features_r8a779a0,
}, {
/* Terminator */
},
--
2.25.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 10+ messages in thread
* RE: [PATCH v2 0/2] iommu/ipmmu-vmsa: Add support for r8a779a0
2021-09-07 8:30 ` Yoshihiro Shimoda
@ 2021-09-21 2:36 ` Yoshihiro Shimoda
-1 siblings, 0 replies; 10+ messages in thread
From: Yoshihiro Shimoda @ 2021-09-21 2:36 UTC (permalink / raw)
To: joro, will, robh+dt; +Cc: linux-renesas-soc, devicetree, iommu
Hi Joerg, Will,
> From: Yoshihiro Shimoda, Sent: Tuesday, September 7, 2021 5:30 PM
>
> This patch series adds support for r8a779a0 (R-Car V3U).
Would you review this patch series?
Best regards,
Yoshihiro Shimoda
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: [PATCH v2 0/2] iommu/ipmmu-vmsa: Add support for r8a779a0
@ 2021-09-21 2:36 ` Yoshihiro Shimoda
0 siblings, 0 replies; 10+ messages in thread
From: Yoshihiro Shimoda @ 2021-09-21 2:36 UTC (permalink / raw)
To: joro, will, robh+dt; +Cc: iommu, devicetree, linux-renesas-soc
Hi Joerg, Will,
> From: Yoshihiro Shimoda, Sent: Tuesday, September 7, 2021 5:30 PM
>
> This patch series adds support for r8a779a0 (R-Car V3U).
Would you review this patch series?
Best regards,
Yoshihiro Shimoda
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] iommu/ipmmu-vmsa: Add support for r8a779a0
2021-09-07 8:30 ` Yoshihiro Shimoda
@ 2021-09-28 9:13 ` Joerg Roedel
-1 siblings, 0 replies; 10+ messages in thread
From: Joerg Roedel @ 2021-09-28 9:13 UTC (permalink / raw)
To: Yoshihiro Shimoda; +Cc: will, robh+dt, iommu, devicetree, linux-renesas-soc
On Tue, Sep 07, 2021 at 05:30:18PM +0900, Yoshihiro Shimoda wrote:
> Yoshihiro Shimoda (2):
> dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779a0 support
> iommu/ipmmu-vmsa: Add support for r8a779a0
Applied, thanks,
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] iommu/ipmmu-vmsa: Add support for r8a779a0
@ 2021-09-28 9:13 ` Joerg Roedel
0 siblings, 0 replies; 10+ messages in thread
From: Joerg Roedel @ 2021-09-28 9:13 UTC (permalink / raw)
To: Yoshihiro Shimoda; +Cc: linux-renesas-soc, devicetree, iommu, robh+dt, will
On Tue, Sep 07, 2021 at 05:30:18PM +0900, Yoshihiro Shimoda wrote:
> Yoshihiro Shimoda (2):
> dt-bindings: iommu: renesas,ipmmu-vmsa: add r8a779a0 support
> iommu/ipmmu-vmsa: Add support for r8a779a0
Applied, thanks,
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 10+ messages in thread