iommu/ipmmu-vmsa: Add support for r8a779a0

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>
Link: https://lore.kernel.org/r/20210907083020.907648-3-yoshihiro.shimoda.uh@renesas.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index d38ff29a76e8f8813ea5e22a3f9a1a95e4dc9f92..d8fe5ba0cb231f46dbbb4fcccfe717636ff6c396 100644 (file)
--- 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 */
        },