Merge tag 'ptrace_stop-cleanup-for-v5.19' of git://git.kernel.org/pub/scm/linux/kerne...
[linux-2.6-microblaze.git] / drivers / iommu / mtk_iommu.c
index d9689e0..bb9dd92 100644 (file)
 #include <linux/io.h>
 #include <linux/iommu.h>
 #include <linux/iopoll.h>
+#include <linux/io-pgtable.h>
 #include <linux/list.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
+#include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
@@ -29,7 +31,7 @@
 #include <asm/barrier.h>
 #include <soc/mediatek/smi.h>
 
-#include "mtk_iommu.h"
+#include <dt-bindings/memory/mtk-memory-port.h>
 
 #define REG_MMU_PT_BASE_ADDR                   0x000
 #define MMU_PT_ADDR_MASK                       GENMASK(31, 7)
 #define REG_MMU1_INT_ID                                0x154
 #define F_MMU_INT_ID_COMM_ID(a)                        (((a) >> 9) & 0x7)
 #define F_MMU_INT_ID_SUB_COMM_ID(a)            (((a) >> 7) & 0x3)
+#define F_MMU_INT_ID_COMM_ID_EXT(a)            (((a) >> 10) & 0x7)
+#define F_MMU_INT_ID_SUB_COMM_ID_EXT(a)                (((a) >> 7) & 0x7)
 #define F_MMU_INT_ID_LARB_ID(a)                        (((a) >> 7) & 0x7)
 #define F_MMU_INT_ID_PORT_ID(a)                        (((a) >> 2) & 0x1f)
 
 #define MTK_PROTECT_PA_ALIGN                   256
+#define MTK_IOMMU_BANK_SZ                      0x1000
+
+#define PERICFG_IOMMU_1                                0x714
 
 #define HAS_4GB_MODE                   BIT(0)
 /* HW will use the EMI clock if there isn't the "bclk". */
 #define HAS_VLD_PA_RNG                 BIT(2)
 #define RESET_AXI                      BIT(3)
 #define OUT_ORDER_WR_EN                        BIT(4)
-#define HAS_SUB_COMM                   BIT(5)
-#define WR_THROT_EN                    BIT(6)
-#define HAS_LEGACY_IVRP_PADDR          BIT(7)
-#define IOVA_34_EN                     BIT(8)
-#define SHARE_PGTABLE                  BIT(9) /* 2 HW share pgtable */
-#define DCM_DISABLE                    BIT(10)
-#define STD_AXI_MODE                   BIT(11) /* For non MM iommu */
+#define HAS_SUB_COMM_2BITS             BIT(5)
+#define HAS_SUB_COMM_3BITS             BIT(6)
+#define WR_THROT_EN                    BIT(7)
+#define HAS_LEGACY_IVRP_PADDR          BIT(8)
+#define IOVA_34_EN                     BIT(9)
+#define SHARE_PGTABLE                  BIT(10) /* 2 HW share pgtable */
+#define DCM_DISABLE                    BIT(11)
+#define STD_AXI_MODE                   BIT(12) /* For non MM iommu */
+/* 2 bits: iommu type */
+#define MTK_IOMMU_TYPE_MM              (0x0 << 13)
+#define MTK_IOMMU_TYPE_INFRA           (0x1 << 13)
+#define MTK_IOMMU_TYPE_MASK            (0x3 << 13)
+/* PM and clock always on. e.g. infra iommu */
+#define PM_CLK_AO                      BIT(15)
+#define IFA_IOMMU_PCIE_SUPPORT         BIT(16)
+
+#define MTK_IOMMU_HAS_FLAG_MASK(pdata, _x, mask)       \
+                               ((((pdata)->flags) & (mask)) == (_x))
+
+#define MTK_IOMMU_HAS_FLAG(pdata, _x)  MTK_IOMMU_HAS_FLAG_MASK(pdata, _x, _x)
+#define MTK_IOMMU_IS_TYPE(pdata, _x)   MTK_IOMMU_HAS_FLAG_MASK(pdata, _x,\
+                                                       MTK_IOMMU_TYPE_MASK)
+
+#define MTK_INVALID_LARBID             MTK_LARB_NR_MAX
+
+#define MTK_LARB_COM_MAX       8
+#define MTK_LARB_SUBCOM_MAX    8
+
+#define MTK_IOMMU_GROUP_MAX    8
+#define MTK_IOMMU_BANK_MAX     5
+
+enum mtk_iommu_plat {
+       M4U_MT2712,
+       M4U_MT6779,
+       M4U_MT8167,
+       M4U_MT8173,
+       M4U_MT8183,
+       M4U_MT8186,
+       M4U_MT8192,
+       M4U_MT8195,
+};
+
+struct mtk_iommu_iova_region {
+       dma_addr_t              iova_base;
+       unsigned long long      size;
+};
+
+struct mtk_iommu_suspend_reg {
+       u32                     misc_ctrl;
+       u32                     dcm_dis;
+       u32                     ctrl_reg;
+       u32                     vld_pa_rng;
+       u32                     wr_len_ctrl;
+
+       u32                     int_control[MTK_IOMMU_BANK_MAX];
+       u32                     int_main_control[MTK_IOMMU_BANK_MAX];
+       u32                     ivrp_paddr[MTK_IOMMU_BANK_MAX];
+};
+
+struct mtk_iommu_plat_data {
+       enum mtk_iommu_plat     m4u_plat;
+       u32                     flags;
+       u32                     inv_sel_reg;
+
+       char                    *pericfg_comp_str;
+       struct list_head        *hw_list;
+       unsigned int            iova_region_nr;
+       const struct mtk_iommu_iova_region      *iova_region;
+
+       u8                  banks_num;
+       bool                banks_enable[MTK_IOMMU_BANK_MAX];
+       unsigned int        banks_portmsk[MTK_IOMMU_BANK_MAX];
+       unsigned char       larbid_remap[MTK_LARB_COM_MAX][MTK_LARB_SUBCOM_MAX];
+};
+
+struct mtk_iommu_bank_data {
+       void __iomem                    *base;
+       int                             irq;
+       u8                              id;
+       struct device                   *parent_dev;
+       struct mtk_iommu_data           *parent_data;
+       spinlock_t                      tlb_lock; /* lock for tlb range flush */
+       struct mtk_iommu_domain         *m4u_dom; /* Each bank has a domain */
+};
 
-#define MTK_IOMMU_HAS_FLAG(pdata, _x) \
-               ((((pdata)->flags) & (_x)) == (_x))
+struct mtk_iommu_data {
+       struct device                   *dev;
+       struct clk                      *bclk;
+       phys_addr_t                     protect_base; /* protect memory base */
+       struct mtk_iommu_suspend_reg    reg;
+       struct iommu_group              *m4u_group[MTK_IOMMU_GROUP_MAX];
+       bool                            enable_4GB;
+
+       struct iommu_device             iommu;
+       const struct mtk_iommu_plat_data *plat_data;
+       struct device                   *smicomm_dev;
+
+       struct mtk_iommu_bank_data      *bank;
+
+       struct dma_iommu_mapping        *mapping; /* For mtk_iommu_v1.c */
+       struct regmap                   *pericfg;
+
+       struct mutex                    mutex; /* Protect m4u_group/m4u_dom above */
+
+       /*
+        * In the sharing pgtable case, list data->list to the global list like m4ulist.
+        * In the non-sharing pgtable case, list data->list to the itself hw_list_head.
+        */
+       struct list_head                *hw_list;
+       struct list_head                hw_list_head;
+       struct list_head                list;
+       struct mtk_smi_larb_iommu       larb_imu[MTK_LARB_NR_MAX];
+};
 
 struct mtk_iommu_domain {
        struct io_pgtable_cfg           cfg;
        struct io_pgtable_ops           *iop;
 
-       struct mtk_iommu_data           *data;
+       struct mtk_iommu_bank_data      *bank;
        struct iommu_domain             domain;
 
        struct mutex                    mutex; /* Protect "data" in this structure */
 };
 
+static int mtk_iommu_bind(struct device *dev)
+{
+       struct mtk_iommu_data *data = dev_get_drvdata(dev);
+
+       return component_bind_all(dev, &data->larb_imu);
+}
+
+static void mtk_iommu_unbind(struct device *dev)
+{
+       struct mtk_iommu_data *data = dev_get_drvdata(dev);
+
+       component_unbind_all(dev, &data->larb_imu);
+}
+
 static const struct iommu_ops mtk_iommu_ops;
 
-static int mtk_iommu_hw_init(const struct mtk_iommu_data *data);
+static int mtk_iommu_hw_init(const struct mtk_iommu_data *data, unsigned int bankid);
 
 #define MTK_IOMMU_TLB_ADDR(iova) ({                                    \
        dma_addr_t _addr = iova;                                        \
@@ -174,11 +298,6 @@ static LIST_HEAD(m4ulist); /* List all the M4U HWs */
 
 #define for_each_m4u(data, head)  list_for_each_entry(data, head, list)
 
-struct mtk_iommu_iova_region {
-       dma_addr_t              iova_base;
-       unsigned long long      size;
-};
-
 static const struct mtk_iommu_iova_region single_domain[] = {
        {.iova_base = 0,                .size = SZ_4G},
 };
@@ -208,46 +327,72 @@ static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom)
 
 static void mtk_iommu_tlb_flush_all(struct mtk_iommu_data *data)
 {
+       /* Tlb flush all always is in bank0. */
+       struct mtk_iommu_bank_data *bank = &data->bank[0];
+       void __iomem *base = bank->base;
        unsigned long flags;
 
-       spin_lock_irqsave(&data->tlb_lock, flags);
-       writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
-                      data->base + data->plat_data->inv_sel_reg);
-       writel_relaxed(F_ALL_INVLD, data->base + REG_MMU_INVALIDATE);
+       spin_lock_irqsave(&bank->tlb_lock, flags);
+       writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0, base + data->plat_data->inv_sel_reg);
+       writel_relaxed(F_ALL_INVLD, base + REG_MMU_INVALIDATE);
        wmb(); /* Make sure the tlb flush all done */
-       spin_unlock_irqrestore(&data->tlb_lock, flags);
+       spin_unlock_irqrestore(&bank->tlb_lock, flags);
 }
 
 static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
-                                          struct mtk_iommu_data *data)
+                                          struct mtk_iommu_bank_data *bank)
 {
-       struct list_head *head = data->hw_list;
+       struct list_head *head = bank->parent_data->hw_list;
+       struct mtk_iommu_bank_data *curbank;
+       struct mtk_iommu_data *data;
+       bool check_pm_status;
        unsigned long flags;
+       void __iomem *base;
        int ret;
        u32 tmp;
 
        for_each_m4u(data, head) {
-               if (pm_runtime_get_if_in_use(data->dev) <= 0)
-                       continue;
+               /*
+                * To avoid resume the iommu device frequently when the iommu device
+                * is not active, it doesn't always call pm_runtime_get here, then tlb
+                * flush depends on the tlb flush all in the runtime resume.
+                *
+                * There are 2 special cases:
+                *
+                * Case1: The iommu dev doesn't have power domain but has bclk. This case
+                * should also avoid the tlb flush while the dev is not active to mute
+                * the tlb timeout log. like mt8173.
+                *
+                * Case2: The power/clock of infra iommu is always on, and it doesn't
+                * have the device link with the master devices. This case should avoid
+                * the PM status check.
+                */
+               check_pm_status = !MTK_IOMMU_HAS_FLAG(data->plat_data, PM_CLK_AO);
+
+               if (check_pm_status) {
+                       if (pm_runtime_get_if_in_use(data->dev) <= 0)
+                               continue;
+               }
+
+               curbank = &data->bank[bank->id];
+               base = curbank->base;
 
-               spin_lock_irqsave(&data->tlb_lock, flags);
+               spin_lock_irqsave(&curbank->tlb_lock, flags);
                writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
-                              data->base + data->plat_data->inv_sel_reg);
+                              base + data->plat_data->inv_sel_reg);
 
-               writel_relaxed(MTK_IOMMU_TLB_ADDR(iova),
-                              data->base + REG_MMU_INVLD_START_A);
+               writel_relaxed(MTK_IOMMU_TLB_ADDR(iova), base + REG_MMU_INVLD_START_A);
                writel_relaxed(MTK_IOMMU_TLB_ADDR(iova + size - 1),
-                              data->base + REG_MMU_INVLD_END_A);
-               writel_relaxed(F_MMU_INV_RANGE,
-                              data->base + REG_MMU_INVALIDATE);
+                              base + REG_MMU_INVLD_END_A);
+               writel_relaxed(F_MMU_INV_RANGE, base + REG_MMU_INVALIDATE);
 
                /* tlb sync */
-               ret = readl_poll_timeout_atomic(data->base + REG_MMU_CPE_DONE,
+               ret = readl_poll_timeout_atomic(base + REG_MMU_CPE_DONE,
                                                tmp, tmp != 0, 10, 1000);
 
                /* Clear the CPE status */
-               writel_relaxed(0, data->base + REG_MMU_CPE_DONE);
-               spin_unlock_irqrestore(&data->tlb_lock, flags);
+               writel_relaxed(0, base + REG_MMU_CPE_DONE);
+               spin_unlock_irqrestore(&curbank->tlb_lock, flags);
 
                if (ret) {
                        dev_warn(data->dev,
@@ -255,33 +400,37 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
                        mtk_iommu_tlb_flush_all(data);
                }
 
-               pm_runtime_put(data->dev);
+               if (check_pm_status)
+                       pm_runtime_put(data->dev);
        }
 }
 
 static irqreturn_t mtk_iommu_isr(int irq, void *dev_id)
 {
-       struct mtk_iommu_data *data = dev_id;
-       struct mtk_iommu_domain *dom = data->m4u_dom;
-       unsigned int fault_larb, fault_port, sub_comm = 0;
+       struct mtk_iommu_bank_data *bank = dev_id;
+       struct mtk_iommu_data *data = bank->parent_data;
+       struct mtk_iommu_domain *dom = bank->m4u_dom;
+       unsigned int fault_larb = MTK_INVALID_LARBID, fault_port = 0, sub_comm = 0;
        u32 int_state, regval, va34_32, pa34_32;
+       const struct mtk_iommu_plat_data *plat_data = data->plat_data;
+       void __iomem *base = bank->base;
        u64 fault_iova, fault_pa;
        bool layer, write;
 
        /* Read error info from registers */
-       int_state = readl_relaxed(data->base + REG_MMU_FAULT_ST1);
+       int_state = readl_relaxed(base + REG_MMU_FAULT_ST1);
        if (int_state & F_REG_MMU0_FAULT_MASK) {
-               regval = readl_relaxed(data->base + REG_MMU0_INT_ID);
-               fault_iova = readl_relaxed(data->base + REG_MMU0_FAULT_VA);
-               fault_pa = readl_relaxed(data->base + REG_MMU0_INVLD_PA);
+               regval = readl_relaxed(base + REG_MMU0_INT_ID);
+               fault_iova = readl_relaxed(base + REG_MMU0_FAULT_VA);
+               fault_pa = readl_relaxed(base + REG_MMU0_INVLD_PA);
        } else {
-               regval = readl_relaxed(data->base + REG_MMU1_INT_ID);
-               fault_iova = readl_relaxed(data->base + REG_MMU1_FAULT_VA);
-               fault_pa = readl_relaxed(data->base + REG_MMU1_INVLD_PA);
+               regval = readl_relaxed(base + REG_MMU1_INT_ID);
+               fault_iova = readl_relaxed(base + REG_MMU1_FAULT_VA);
+               fault_pa = readl_relaxed(base + REG_MMU1_INVLD_PA);
        }
        layer = fault_iova & F_MMU_FAULT_VA_LAYER_BIT;
        write = fault_iova & F_MMU_FAULT_VA_WRITE_BIT;
-       if (MTK_IOMMU_HAS_FLAG(data->plat_data, IOVA_34_EN)) {
+       if (MTK_IOMMU_HAS_FLAG(plat_data, IOVA_34_EN)) {
                va34_32 = FIELD_GET(F_MMU_INVAL_VA_34_32_MASK, fault_iova);
                fault_iova = fault_iova & F_MMU_INVAL_VA_31_12_MASK;
                fault_iova |= (u64)va34_32 << 32;
@@ -289,36 +438,65 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id)
        pa34_32 = FIELD_GET(F_MMU_INVAL_PA_34_32_MASK, fault_iova);
        fault_pa |= (u64)pa34_32 << 32;
 
-       fault_port = F_MMU_INT_ID_PORT_ID(regval);
-       if (MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_SUB_COMM)) {
-               fault_larb = F_MMU_INT_ID_COMM_ID(regval);
-               sub_comm = F_MMU_INT_ID_SUB_COMM_ID(regval);
-       } else {
-               fault_larb = F_MMU_INT_ID_LARB_ID(regval);
+       if (MTK_IOMMU_IS_TYPE(plat_data, MTK_IOMMU_TYPE_MM)) {
+               fault_port = F_MMU_INT_ID_PORT_ID(regval);
+               if (MTK_IOMMU_HAS_FLAG(plat_data, HAS_SUB_COMM_2BITS)) {
+                       fault_larb = F_MMU_INT_ID_COMM_ID(regval);
+                       sub_comm = F_MMU_INT_ID_SUB_COMM_ID(regval);
+               } else if (MTK_IOMMU_HAS_FLAG(plat_data, HAS_SUB_COMM_3BITS)) {
+                       fault_larb = F_MMU_INT_ID_COMM_ID_EXT(regval);
+                       sub_comm = F_MMU_INT_ID_SUB_COMM_ID_EXT(regval);
+               } else {
+                       fault_larb = F_MMU_INT_ID_LARB_ID(regval);
+               }
+               fault_larb = data->plat_data->larbid_remap[fault_larb][sub_comm];
        }
-       fault_larb = data->plat_data->larbid_remap[fault_larb][sub_comm];
 
-       if (report_iommu_fault(&dom->domain, data->dev, fault_iova,
+       if (report_iommu_fault(&dom->domain, bank->parent_dev, fault_iova,
                               write ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ)) {
                dev_err_ratelimited(
-                       data->dev,
-                       "fault type=0x%x iova=0x%llx pa=0x%llx larb=%d port=%d layer=%d %s\n",
-                       int_state, fault_iova, fault_pa, fault_larb, fault_port,
+                       bank->parent_dev,
+                       "fault type=0x%x iova=0x%llx pa=0x%llx master=0x%x(larb=%d port=%d) layer=%d %s\n",
+                       int_state, fault_iova, fault_pa, regval, fault_larb, fault_port,
                        layer, write ? "write" : "read");
        }
 
        /* Interrupt clear */
-       regval = readl_relaxed(data->base + REG_MMU_INT_CONTROL0);
+       regval = readl_relaxed(base + REG_MMU_INT_CONTROL0);
        regval |= F_INT_CLR_BIT;
-       writel_relaxed(regval, data->base + REG_MMU_INT_CONTROL0);
+       writel_relaxed(regval, base + REG_MMU_INT_CONTROL0);
 
        mtk_iommu_tlb_flush_all(data);
 
        return IRQ_HANDLED;
 }
 
-static int mtk_iommu_get_domain_id(struct device *dev,
-                                  const struct mtk_iommu_plat_data *plat_data)
+static unsigned int mtk_iommu_get_bank_id(struct device *dev,
+                                         const struct mtk_iommu_plat_data *plat_data)
+{
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
+       unsigned int i, portmsk = 0, bankid = 0;
+
+       if (plat_data->banks_num == 1)
+               return bankid;
+
+       for (i = 0; i < fwspec->num_ids; i++)
+               portmsk |= BIT(MTK_M4U_TO_PORT(fwspec->ids[i]));
+
+       for (i = 0; i < plat_data->banks_num && i < MTK_IOMMU_BANK_MAX; i++) {
+               if (!plat_data->banks_enable[i])
+                       continue;
+
+               if (portmsk & plat_data->banks_portmsk[i]) {
+                       bankid = i;
+                       break;
+               }
+       }
+       return bankid; /* default is 0 */
+}
+
+static int mtk_iommu_get_iova_region_id(struct device *dev,
+                                       const struct mtk_iommu_plat_data *plat_data)
 {
        const struct mtk_iommu_iova_region *rgn = plat_data->iova_region;
        const struct bus_dma_region *dma_rgn = dev->dma_range_map;
@@ -347,46 +525,65 @@ static int mtk_iommu_get_domain_id(struct device *dev,
        return -EINVAL;
 }
 
-static void mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev,
-                            bool enable, unsigned int domid)
+static int mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev,
+                           bool enable, unsigned int regionid)
 {
        struct mtk_smi_larb_iommu    *larb_mmu;
        unsigned int                 larbid, portid;
        struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
        const struct mtk_iommu_iova_region *region;
-       int i;
+       u32 peri_mmuen, peri_mmuen_msk;
+       int i, ret = 0;
 
        for (i = 0; i < fwspec->num_ids; ++i) {
                larbid = MTK_M4U_TO_LARB(fwspec->ids[i]);
                portid = MTK_M4U_TO_PORT(fwspec->ids[i]);
 
-               larb_mmu = &data->larb_imu[larbid];
-
-               region = data->plat_data->iova_region + domid;
-               larb_mmu->bank[portid] = upper_32_bits(region->iova_base);
-
-               dev_dbg(dev, "%s iommu for larb(%s) port %d dom %d bank %d.\n",
-                       enable ? "enable" : "disable", dev_name(larb_mmu->dev),
-                       portid, domid, larb_mmu->bank[portid]);
-
-               if (enable)
-                       larb_mmu->mmu |= MTK_SMI_MMU_EN(portid);
-               else
-                       larb_mmu->mmu &= ~MTK_SMI_MMU_EN(portid);
+               if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM)) {
+                       larb_mmu = &data->larb_imu[larbid];
+
+                       region = data->plat_data->iova_region + regionid;
+                       larb_mmu->bank[portid] = upper_32_bits(region->iova_base);
+
+                       dev_dbg(dev, "%s iommu for larb(%s) port %d region %d rgn-bank %d.\n",
+                               enable ? "enable" : "disable", dev_name(larb_mmu->dev),
+                               portid, regionid, larb_mmu->bank[portid]);
+
+                       if (enable)
+                               larb_mmu->mmu |= MTK_SMI_MMU_EN(portid);
+                       else
+                               larb_mmu->mmu &= ~MTK_SMI_MMU_EN(portid);
+               } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA)) {
+                       peri_mmuen_msk = BIT(portid);
+                       /* PCI dev has only one output id, enable the next writing bit for PCIe */
+                       if (dev_is_pci(dev))
+                               peri_mmuen_msk |= BIT(portid + 1);
+
+                       peri_mmuen = enable ? peri_mmuen_msk : 0;
+                       ret = regmap_update_bits(data->pericfg, PERICFG_IOMMU_1,
+                                                peri_mmuen_msk, peri_mmuen);
+                       if (ret)
+                               dev_err(dev, "%s iommu(%s) inframaster 0x%x fail(%d).\n",
+                                       enable ? "enable" : "disable",
+                                       dev_name(data->dev), peri_mmuen_msk, ret);
+               }
        }
+       return ret;
 }
 
 static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom,
                                     struct mtk_iommu_data *data,
-                                    unsigned int domid)
+                                    unsigned int region_id)
 {
        const struct mtk_iommu_iova_region *region;
-
-       /* Use the exist domain as there is only one pgtable here. */
-       if (data->m4u_dom) {
-               dom->iop = data->m4u_dom->iop;
-               dom->cfg = data->m4u_dom->cfg;
-               dom->domain.pgsize_bitmap = data->m4u_dom->cfg.pgsize_bitmap;
+       struct mtk_iommu_domain *m4u_dom;
+
+       /* Always use bank0 in sharing pgtable case */
+       m4u_dom = data->bank[0].m4u_dom;
+       if (m4u_dom) {
+               dom->iop = m4u_dom->iop;
+               dom->cfg = m4u_dom->cfg;
+               dom->domain.pgsize_bitmap = m4u_dom->cfg.pgsize_bitmap;
                goto update_iova_region;
        }
 
@@ -415,7 +612,7 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom,
 
 update_iova_region:
        /* Update the iova region for this domain */
-       region = data->plat_data->iova_region + domid;
+       region = data->plat_data->iova_region + region_id;
        dom->domain.geometry.aperture_start = region->iova_base;
        dom->domain.geometry.aperture_end = region->iova_base + region->size - 1;
        dom->domain.geometry.force_aperture = true;
@@ -426,7 +623,7 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type)
 {
        struct mtk_iommu_domain *dom;
 
-       if (type != IOMMU_DOMAIN_DMA)
+       if (type != IOMMU_DOMAIN_DMA && type != IOMMU_DOMAIN_UNMANAGED)
                return NULL;
 
        dom = kzalloc(sizeof(*dom), GFP_KERNEL);
@@ -449,47 +646,52 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
        struct mtk_iommu_domain *dom = to_mtk_domain(domain);
        struct list_head *hw_list = data->hw_list;
        struct device *m4udev = data->dev;
-       int ret, domid;
+       struct mtk_iommu_bank_data *bank;
+       unsigned int bankid;
+       int ret, region_id;
 
-       domid = mtk_iommu_get_domain_id(dev, data->plat_data);
-       if (domid < 0)
-               return domid;
+       region_id = mtk_iommu_get_iova_region_id(dev, data->plat_data);
+       if (region_id < 0)
+               return region_id;
 
+       bankid = mtk_iommu_get_bank_id(dev, data->plat_data);
        mutex_lock(&dom->mutex);
-       if (!dom->data) {
+       if (!dom->bank) {
                /* Data is in the frstdata in sharing pgtable case. */
                frstdata = mtk_iommu_get_frst_data(hw_list);
 
-               ret = mtk_iommu_domain_finalise(dom, frstdata, domid);
+               ret = mtk_iommu_domain_finalise(dom, frstdata, region_id);
                if (ret) {
                        mutex_unlock(&dom->mutex);
                        return -ENODEV;
                }
-               dom->data = data;
+               dom->bank = &data->bank[bankid];
        }
        mutex_unlock(&dom->mutex);
 
        mutex_lock(&data->mutex);
-       if (!data->m4u_dom) { /* Initialize the M4U HW */
+       bank = &data->bank[bankid];
+       if (!bank->m4u_dom) { /* Initialize the M4U HW for each a BANK */
                ret = pm_runtime_resume_and_get(m4udev);
-               if (ret < 0)
+               if (ret < 0) {
+                       dev_err(m4udev, "pm get fail(%d) in attach.\n", ret);
                        goto err_unlock;
+               }
 
-               ret = mtk_iommu_hw_init(data);
+               ret = mtk_iommu_hw_init(data, bankid);
                if (ret) {
                        pm_runtime_put(m4udev);
                        goto err_unlock;
                }
-               data->m4u_dom = dom;
+               bank->m4u_dom = dom;
                writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
-                      data->base + REG_MMU_PT_BASE_ADDR);
+                      bank->base + REG_MMU_PT_BASE_ADDR);
 
                pm_runtime_put(m4udev);
        }
        mutex_unlock(&data->mutex);
 
-       mtk_iommu_config(data, dev, true, domid);
-       return 0;
+       return mtk_iommu_config(data, dev, true, region_id);
 
 err_unlock:
        mutex_unlock(&data->mutex);
@@ -510,7 +712,7 @@ static int mtk_iommu_map(struct iommu_domain *domain, unsigned long iova,
        struct mtk_iommu_domain *dom = to_mtk_domain(domain);
 
        /* The "4GB mode" M4U physically can not use the lower remap of Dram. */
-       if (dom->data->enable_4GB)
+       if (dom->bank->parent_data->enable_4GB)
                paddr |= BIT_ULL(32);
 
        /* Synchronize with the tlb_lock */
@@ -531,7 +733,7 @@ static void mtk_iommu_flush_iotlb_all(struct iommu_domain *domain)
 {
        struct mtk_iommu_domain *dom = to_mtk_domain(domain);
 
-       mtk_iommu_tlb_flush_all(dom->data);
+       mtk_iommu_tlb_flush_all(dom->bank->parent_data);
 }
 
 static void mtk_iommu_iotlb_sync(struct iommu_domain *domain,
@@ -540,7 +742,7 @@ static void mtk_iommu_iotlb_sync(struct iommu_domain *domain,
        struct mtk_iommu_domain *dom = to_mtk_domain(domain);
        size_t length = gather->end - gather->start + 1;
 
-       mtk_iommu_tlb_flush_range_sync(gather->start, length, dom->data);
+       mtk_iommu_tlb_flush_range_sync(gather->start, length, dom->bank);
 }
 
 static void mtk_iommu_sync_map(struct iommu_domain *domain, unsigned long iova,
@@ -548,7 +750,7 @@ static void mtk_iommu_sync_map(struct iommu_domain *domain, unsigned long iova,
 {
        struct mtk_iommu_domain *dom = to_mtk_domain(domain);
 
-       mtk_iommu_tlb_flush_range_sync(iova, size, dom->data);
+       mtk_iommu_tlb_flush_range_sync(iova, size, dom->bank);
 }
 
 static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
@@ -559,7 +761,7 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
 
        pa = dom->iop->iova_to_phys(dom->iop, iova);
        if (IS_ENABLED(CONFIG_PHYS_ADDR_T_64BIT) &&
-           dom->data->enable_4GB &&
+           dom->bank->parent_data->enable_4GB &&
            pa >= MTK_IOMMU_4GB_MODE_REMAP_BASE)
                pa &= ~BIT_ULL(32);
 
@@ -579,12 +781,18 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
 
        data = dev_iommu_priv_get(dev);
 
+       if (!MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM))
+               return &data->iommu;
+
        /*
         * Link the consumer device with the smi-larb device(supplier).
         * The device that connects with each a larb is a independent HW.
         * All the ports in each a device should be in the same larbs.
         */
        larbid = MTK_M4U_TO_LARB(fwspec->ids[0]);
+       if (larbid >= MTK_LARB_NR_MAX)
+               return ERR_PTR(-EINVAL);
+
        for (i = 1; i < fwspec->num_ids; i++) {
                larbidx = MTK_M4U_TO_LARB(fwspec->ids[i]);
                if (larbid != larbidx) {
@@ -594,6 +802,9 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
                }
        }
        larbdev = data->larb_imu[larbid].dev;
+       if (!larbdev)
+               return ERR_PTR(-EINVAL);
+
        link = device_link_add(dev, larbdev,
                               DL_FLAG_PM_RUNTIME | DL_FLAG_STATELESS);
        if (!link)
@@ -612,34 +823,51 @@ static void mtk_iommu_release_device(struct device *dev)
                return;
 
        data = dev_iommu_priv_get(dev);
-       larbid = MTK_M4U_TO_LARB(fwspec->ids[0]);
-       larbdev = data->larb_imu[larbid].dev;
-       device_link_remove(dev, larbdev);
+       if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM)) {
+               larbid = MTK_M4U_TO_LARB(fwspec->ids[0]);
+               larbdev = data->larb_imu[larbid].dev;
+               device_link_remove(dev, larbdev);
+       }
 
        iommu_fwspec_free(dev);
 }
 
+static int mtk_iommu_get_group_id(struct device *dev, const struct mtk_iommu_plat_data *plat_data)
+{
+       unsigned int bankid;
+
+       /*
+        * If the bank function is enabled, each bank is a iommu group/domain.
+        * Otherwise, each iova region is a iommu group/domain.
+        */
+       bankid = mtk_iommu_get_bank_id(dev, plat_data);
+       if (bankid)
+               return bankid;
+
+       return mtk_iommu_get_iova_region_id(dev, plat_data);
+}
+
 static struct iommu_group *mtk_iommu_device_group(struct device *dev)
 {
        struct mtk_iommu_data *c_data = dev_iommu_priv_get(dev), *data;
        struct list_head *hw_list = c_data->hw_list;
        struct iommu_group *group;
-       int domid;
+       int groupid;
 
        data = mtk_iommu_get_frst_data(hw_list);
        if (!data)
                return ERR_PTR(-ENODEV);
 
-       domid = mtk_iommu_get_domain_id(dev, data->plat_data);
-       if (domid < 0)
-               return ERR_PTR(domid);
+       groupid = mtk_iommu_get_group_id(dev, data->plat_data);
+       if (groupid < 0)
+               return ERR_PTR(groupid);
 
        mutex_lock(&data->mutex);
-       group = data->m4u_group[domid];
+       group = data->m4u_group[groupid];
        if (!group) {
                group = iommu_group_alloc();
                if (!IS_ERR(group))
-                       data->m4u_group[domid] = group;
+                       data->m4u_group[groupid] = group;
        } else {
                iommu_group_ref_get(group);
        }
@@ -673,14 +901,14 @@ static void mtk_iommu_get_resv_regions(struct device *dev,
                                       struct list_head *head)
 {
        struct mtk_iommu_data *data = dev_iommu_priv_get(dev);
-       unsigned int domid = mtk_iommu_get_domain_id(dev, data->plat_data), i;
+       unsigned int regionid = mtk_iommu_get_iova_region_id(dev, data->plat_data), i;
        const struct mtk_iommu_iova_region *resv, *curdom;
        struct iommu_resv_region *region;
        int prot = IOMMU_WRITE | IOMMU_READ;
 
-       if ((int)domid < 0)
+       if ((int)regionid < 0)
                return;
-       curdom = data->plat_data->iova_region + domid;
+       curdom = data->plat_data->iova_region + regionid;
        for (i = 0; i < data->plat_data->iova_region_nr; i++) {
                resv = data->plat_data->iova_region + i;
 
@@ -721,42 +949,24 @@ static const struct iommu_ops mtk_iommu_ops = {
        }
 };
 
-static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
+static int mtk_iommu_hw_init(const struct mtk_iommu_data *data, unsigned int bankid)
 {
+       const struct mtk_iommu_bank_data *bankx = &data->bank[bankid];
+       const struct mtk_iommu_bank_data *bank0 = &data->bank[0];
        u32 regval;
 
+       /*
+        * Global control settings are in bank0. May re-init these global registers
+        * since no sure if there is bank0 consumers.
+        */
        if (data->plat_data->m4u_plat == M4U_MT8173) {
                regval = F_MMU_PREFETCH_RT_REPLACE_MOD |
                         F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173;
        } else {
-               regval = readl_relaxed(data->base + REG_MMU_CTRL_REG);
+               regval = readl_relaxed(bank0->base + REG_MMU_CTRL_REG);
                regval |= F_MMU_TF_PROT_TO_PROGRAM_ADDR;
        }
-       writel_relaxed(regval, data->base + REG_MMU_CTRL_REG);
-
-       regval = F_L2_MULIT_HIT_EN |
-               F_TABLE_WALK_FAULT_INT_EN |
-               F_PREETCH_FIFO_OVERFLOW_INT_EN |
-               F_MISS_FIFO_OVERFLOW_INT_EN |
-               F_PREFETCH_FIFO_ERR_INT_EN |
-               F_MISS_FIFO_ERR_INT_EN;
-       writel_relaxed(regval, data->base + REG_MMU_INT_CONTROL0);
-
-       regval = F_INT_TRANSLATION_FAULT |
-               F_INT_MAIN_MULTI_HIT_FAULT |
-               F_INT_INVALID_PA_FAULT |
-               F_INT_ENTRY_REPLACEMENT_FAULT |
-               F_INT_TLB_MISS_FAULT |
-               F_INT_MISS_TRANSACTION_FIFO_FAULT |
-               F_INT_PRETETCH_TRANSATION_FIFO_FAULT;
-       writel_relaxed(regval, data->base + REG_MMU_INT_MAIN_CONTROL);
-
-       if (MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_LEGACY_IVRP_PADDR))
-               regval = (data->protect_base >> 1) | (data->enable_4GB << 31);
-       else
-               regval = lower_32_bits(data->protect_base) |
-                        upper_32_bits(data->protect_base);
-       writel_relaxed(regval, data->base + REG_MMU_IVRP_PADDR);
+       writel_relaxed(regval, bank0->base + REG_MMU_CTRL_REG);
 
        if (data->enable_4GB &&
            MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_VLD_PA_RNG)) {
@@ -765,36 +975,61 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
                 * 0x1_0000_0000 to 0x1_ffff_ffff. here record bit[32:30].
                 */
                regval = F_MMU_VLD_PA_RNG(7, 4);
-               writel_relaxed(regval, data->base + REG_MMU_VLD_PA_RNG);
+               writel_relaxed(regval, bank0->base + REG_MMU_VLD_PA_RNG);
        }
        if (MTK_IOMMU_HAS_FLAG(data->plat_data, DCM_DISABLE))
-               writel_relaxed(F_MMU_DCM, data->base + REG_MMU_DCM_DIS);
+               writel_relaxed(F_MMU_DCM, bank0->base + REG_MMU_DCM_DIS);
        else
-               writel_relaxed(0, data->base + REG_MMU_DCM_DIS);
+               writel_relaxed(0, bank0->base + REG_MMU_DCM_DIS);
 
        if (MTK_IOMMU_HAS_FLAG(data->plat_data, WR_THROT_EN)) {
                /* write command throttling mode */
-               regval = readl_relaxed(data->base + REG_MMU_WR_LEN_CTRL);
+               regval = readl_relaxed(bank0->base + REG_MMU_WR_LEN_CTRL);
                regval &= ~F_MMU_WR_THROT_DIS_MASK;
-               writel_relaxed(regval, data->base + REG_MMU_WR_LEN_CTRL);
+               writel_relaxed(regval, bank0->base + REG_MMU_WR_LEN_CTRL);
        }
 
        if (MTK_IOMMU_HAS_FLAG(data->plat_data, RESET_AXI)) {
                /* The register is called STANDARD_AXI_MODE in this case */
                regval = 0;
        } else {
-               regval = readl_relaxed(data->base + REG_MMU_MISC_CTRL);
+               regval = readl_relaxed(bank0->base + REG_MMU_MISC_CTRL);
                if (!MTK_IOMMU_HAS_FLAG(data->plat_data, STD_AXI_MODE))
                        regval &= ~F_MMU_STANDARD_AXI_MODE_MASK;
                if (MTK_IOMMU_HAS_FLAG(data->plat_data, OUT_ORDER_WR_EN))
                        regval &= ~F_MMU_IN_ORDER_WR_EN_MASK;
        }
-       writel_relaxed(regval, data->base + REG_MMU_MISC_CTRL);
+       writel_relaxed(regval, bank0->base + REG_MMU_MISC_CTRL);
+
+       /* Independent settings for each bank */
+       regval = F_L2_MULIT_HIT_EN |
+               F_TABLE_WALK_FAULT_INT_EN |
+               F_PREETCH_FIFO_OVERFLOW_INT_EN |
+               F_MISS_FIFO_OVERFLOW_INT_EN |
+               F_PREFETCH_FIFO_ERR_INT_EN |
+               F_MISS_FIFO_ERR_INT_EN;
+       writel_relaxed(regval, bankx->base + REG_MMU_INT_CONTROL0);
+
+       regval = F_INT_TRANSLATION_FAULT |
+               F_INT_MAIN_MULTI_HIT_FAULT |
+               F_INT_INVALID_PA_FAULT |
+               F_INT_ENTRY_REPLACEMENT_FAULT |
+               F_INT_TLB_MISS_FAULT |
+               F_INT_MISS_TRANSACTION_FIFO_FAULT |
+               F_INT_PRETETCH_TRANSATION_FIFO_FAULT;
+       writel_relaxed(regval, bankx->base + REG_MMU_INT_MAIN_CONTROL);
+
+       if (MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_LEGACY_IVRP_PADDR))
+               regval = (data->protect_base >> 1) | (data->enable_4GB << 31);
+       else
+               regval = lower_32_bits(data->protect_base) |
+                        upper_32_bits(data->protect_base);
+       writel_relaxed(regval, bankx->base + REG_MMU_IVRP_PADDR);
 
-       if (devm_request_irq(data->dev, data->irq, mtk_iommu_isr, 0,
-                            dev_name(data->dev), (void *)data)) {
-               writel_relaxed(0, data->base + REG_MMU_PT_BASE_ADDR);
-               dev_err(data->dev, "Failed @ IRQ-%d Request\n", data->irq);
+       if (devm_request_irq(bankx->parent_dev, bankx->irq, mtk_iommu_isr, 0,
+                            dev_name(bankx->parent_dev), (void *)bankx)) {
+               writel_relaxed(0, bankx->base + REG_MMU_PT_BASE_ADDR);
+               dev_err(bankx->parent_dev, "Failed @ IRQ-%d Request\n", bankx->irq);
                return -ENODEV;
        }
 
@@ -806,21 +1041,91 @@ static const struct component_master_ops mtk_iommu_com_ops = {
        .unbind         = mtk_iommu_unbind,
 };
 
+static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **match,
+                                 struct mtk_iommu_data *data)
+{
+       struct device_node *larbnode, *smicomm_node, *smi_subcomm_node;
+       struct platform_device *plarbdev;
+       struct device_link *link;
+       int i, larb_nr, ret;
+
+       larb_nr = of_count_phandle_with_args(dev->of_node, "mediatek,larbs", NULL);
+       if (larb_nr < 0)
+               return larb_nr;
+
+       for (i = 0; i < larb_nr; i++) {
+               u32 id;
+
+               larbnode = of_parse_phandle(dev->of_node, "mediatek,larbs", i);
+               if (!larbnode)
+                       return -EINVAL;
+
+               if (!of_device_is_available(larbnode)) {
+                       of_node_put(larbnode);
+                       continue;
+               }
+
+               ret = of_property_read_u32(larbnode, "mediatek,larb-id", &id);
+               if (ret)/* The id is consecutive if there is no this property */
+                       id = i;
+
+               plarbdev = of_find_device_by_node(larbnode);
+               if (!plarbdev) {
+                       of_node_put(larbnode);
+                       return -ENODEV;
+               }
+               if (!plarbdev->dev.driver) {
+                       of_node_put(larbnode);
+                       return -EPROBE_DEFER;
+               }
+               data->larb_imu[id].dev = &plarbdev->dev;
+
+               component_match_add_release(dev, match, component_release_of,
+                                           component_compare_of, larbnode);
+       }
+
+       /* Get smi-(sub)-common dev from the last larb. */
+       smi_subcomm_node = of_parse_phandle(larbnode, "mediatek,smi", 0);
+       if (!smi_subcomm_node)
+               return -EINVAL;
+
+       /*
+        * It may have two level smi-common. the node is smi-sub-common if it
+        * has a new mediatek,smi property. otherwise it is smi-commmon.
+        */
+       smicomm_node = of_parse_phandle(smi_subcomm_node, "mediatek,smi", 0);
+       if (smicomm_node)
+               of_node_put(smi_subcomm_node);
+       else
+               smicomm_node = smi_subcomm_node;
+
+       plarbdev = of_find_device_by_node(smicomm_node);
+       of_node_put(smicomm_node);
+       data->smicomm_dev = &plarbdev->dev;
+
+       link = device_link_add(data->smicomm_dev, dev,
+                              DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
+       if (!link) {
+               dev_err(dev, "Unable to link %s.\n", dev_name(data->smicomm_dev));
+               return -EINVAL;
+       }
+       return 0;
+}
+
 static int mtk_iommu_probe(struct platform_device *pdev)
 {
        struct mtk_iommu_data   *data;
        struct device           *dev = &pdev->dev;
-       struct device_node      *larbnode, *smicomm_node;
-       struct platform_device  *plarbdev;
-       struct device_link      *link;
        struct resource         *res;
        resource_size_t         ioaddr;
        struct component_match  *match = NULL;
        struct regmap           *infracfg;
        void                    *protect;
-       int                     i, larb_nr, ret;
+       int                     ret, banks_num, i = 0;
        u32                     val;
        char                    *p;
+       struct mtk_iommu_bank_data *bank;
+       void __iomem            *base;
 
        data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
        if (!data)
@@ -857,15 +1162,36 @@ static int mtk_iommu_probe(struct platform_device *pdev)
                data->enable_4GB = !!(val & F_DDR_4GB_SUPPORT_EN);
        }
 
+       banks_num = data->plat_data->banks_num;
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       data->base = devm_ioremap_resource(dev, res);
-       if (IS_ERR(data->base))
-               return PTR_ERR(data->base);
+       if (resource_size(res) < banks_num * MTK_IOMMU_BANK_SZ) {
+               dev_err(dev, "banknr %d. res %pR is not enough.\n", banks_num, res);
+               return -EINVAL;
+       }
+       base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
        ioaddr = res->start;
 
-       data->irq = platform_get_irq(pdev, 0);
-       if (data->irq < 0)
-               return data->irq;
+       data->bank = devm_kmalloc(dev, banks_num * sizeof(*data->bank), GFP_KERNEL);
+       if (!data->bank)
+               return -ENOMEM;
+
+       do {
+               if (!data->plat_data->banks_enable[i])
+                       continue;
+               bank = &data->bank[i];
+               bank->id = i;
+               bank->base = base + i * MTK_IOMMU_BANK_SZ;
+               bank->m4u_dom = NULL;
+
+               bank->irq = platform_get_irq(pdev, i);
+               if (bank->irq < 0)
+                       return bank->irq;
+               bank->parent_dev = dev;
+               bank->parent_data = data;
+               spin_lock_init(&bank->tlb_lock);
+       } while (++i < banks_num);
 
        if (MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_BCLK)) {
                data->bclk = devm_clk_get(dev, "bclk");
@@ -873,59 +1199,23 @@ static int mtk_iommu_probe(struct platform_device *pdev)
                        return PTR_ERR(data->bclk);
        }
 
-       larb_nr = of_count_phandle_with_args(dev->of_node,
-                                            "mediatek,larbs", NULL);
-       if (larb_nr < 0)
-               return larb_nr;
-
-       for (i = 0; i < larb_nr; i++) {
-               u32 id;
-
-               larbnode = of_parse_phandle(dev->of_node, "mediatek,larbs", i);
-               if (!larbnode)
-                       return -EINVAL;
-
-               if (!of_device_is_available(larbnode)) {
-                       of_node_put(larbnode);
-                       continue;
-               }
-
-               ret = of_property_read_u32(larbnode, "mediatek,larb-id", &id);
-               if (ret)/* The id is consecutive if there is no this property */
-                       id = i;
+       pm_runtime_enable(dev);
 
-               plarbdev = of_find_device_by_node(larbnode);
-               if (!plarbdev) {
-                       of_node_put(larbnode);
-                       return -ENODEV;
+       if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM)) {
+               ret = mtk_iommu_mm_dts_parse(dev, &match, data);
+               if (ret) {
+                       dev_err(dev, "mm dts parse fail(%d).", ret);
+                       goto out_runtime_disable;
                }
-               if (!plarbdev->dev.driver) {
-                       of_node_put(larbnode);
-                       return -EPROBE_DEFER;
+       } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA) &&
+                  data->plat_data->pericfg_comp_str) {
+               infracfg = syscon_regmap_lookup_by_compatible(data->plat_data->pericfg_comp_str);
+               if (IS_ERR(infracfg)) {
+                       ret = PTR_ERR(infracfg);
+                       goto out_runtime_disable;
                }
-               data->larb_imu[id].dev = &plarbdev->dev;
 
-               component_match_add_release(dev, &match, component_release_of,
-                                           component_compare_of, larbnode);
-       }
-
-       /* Get smi-common dev from the last larb. */
-       smicomm_node = of_parse_phandle(larbnode, "mediatek,smi", 0);
-       if (!smicomm_node)
-               return -EINVAL;
-
-       plarbdev = of_find_device_by_node(smicomm_node);
-       of_node_put(smicomm_node);
-       data->smicomm_dev = &plarbdev->dev;
-
-       pm_runtime_enable(dev);
-
-       link = device_link_add(data->smicomm_dev, dev,
-                       DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
-       if (!link) {
-               dev_err(dev, "Unable to link %s.\n", dev_name(data->smicomm_dev));
-               ret = -EINVAL;
-               goto out_runtime_disable;
+               data->pericfg = infracfg;
        }
 
        platform_set_drvdata(pdev, data);
@@ -940,8 +1230,6 @@ static int mtk_iommu_probe(struct platform_device *pdev)
        if (ret)
                goto out_sysfs_remove;
 
-       spin_lock_init(&data->tlb_lock);
-
        if (MTK_IOMMU_HAS_FLAG(data->plat_data, SHARE_PGTABLE)) {
                list_add_tail(&data->list, data->plat_data->hw_list);
                data->hw_list = data->plat_data->hw_list;
@@ -957,9 +1245,20 @@ static int mtk_iommu_probe(struct platform_device *pdev)
                        goto out_list_del;
        }
 
-       ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
-       if (ret)
-               goto out_bus_set_null;
+       if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM)) {
+               ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
+               if (ret)
+                       goto out_bus_set_null;
+       } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA) &&
+                  MTK_IOMMU_HAS_FLAG(data->plat_data, IFA_IOMMU_PCIE_SUPPORT)) {
+#ifdef CONFIG_PCI
+               if (!iommu_present(&pci_bus_type)) {
+                       ret = bus_set_iommu(&pci_bus_type, &mtk_iommu_ops);
+                       if (ret) /* PCIe fail don't affect platform_bus. */
+                               goto out_list_del;
+               }
+#endif
+       }
        return ret;
 
 out_bus_set_null:
@@ -970,7 +1269,8 @@ out_list_del:
 out_sysfs_remove:
        iommu_device_sysfs_remove(&data->iommu);
 out_link_remove:
-       device_link_remove(data->smicomm_dev, dev);
+       if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM))
+               device_link_remove(data->smicomm_dev, dev);
 out_runtime_disable:
        pm_runtime_disable(dev);
        return ret;
@@ -979,16 +1279,30 @@ out_runtime_disable:
 static int mtk_iommu_remove(struct platform_device *pdev)
 {
        struct mtk_iommu_data *data = platform_get_drvdata(pdev);
+       struct mtk_iommu_bank_data *bank;
+       int i;
 
        iommu_device_sysfs_remove(&data->iommu);
        iommu_device_unregister(&data->iommu);
 
        list_del(&data->list);
 
-       device_link_remove(data->smicomm_dev, &pdev->dev);
+       if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM)) {
+               device_link_remove(data->smicomm_dev, &pdev->dev);
+               component_master_del(&pdev->dev, &mtk_iommu_com_ops);
+       } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA) &&
+                  MTK_IOMMU_HAS_FLAG(data->plat_data, IFA_IOMMU_PCIE_SUPPORT)) {
+#ifdef CONFIG_PCI
+               bus_set_iommu(&pci_bus_type, NULL);
+#endif
+       }
        pm_runtime_disable(&pdev->dev);
-       devm_free_irq(&pdev->dev, data->irq, data);
-       component_master_del(&pdev->dev, &mtk_iommu_com_ops);
+       for (i = 0; i < data->plat_data->banks_num; i++) {
+               bank = &data->bank[i];
+               if (!bank->m4u_dom)
+                       continue;
+               devm_free_irq(&pdev->dev, bank->irq, bank);
+       }
        return 0;
 }
 
@@ -996,16 +1310,23 @@ static int __maybe_unused mtk_iommu_runtime_suspend(struct device *dev)
 {
        struct mtk_iommu_data *data = dev_get_drvdata(dev);
        struct mtk_iommu_suspend_reg *reg = &data->reg;
-       void __iomem *base = data->base;
+       void __iomem *base;
+       int i = 0;
 
+       base = data->bank[i].base;
        reg->wr_len_ctrl = readl_relaxed(base + REG_MMU_WR_LEN_CTRL);
        reg->misc_ctrl = readl_relaxed(base + REG_MMU_MISC_CTRL);
        reg->dcm_dis = readl_relaxed(base + REG_MMU_DCM_DIS);
        reg->ctrl_reg = readl_relaxed(base + REG_MMU_CTRL_REG);
-       reg->int_control0 = readl_relaxed(base + REG_MMU_INT_CONTROL0);
-       reg->int_main_control = readl_relaxed(base + REG_MMU_INT_MAIN_CONTROL);
-       reg->ivrp_paddr = readl_relaxed(base + REG_MMU_IVRP_PADDR);
        reg->vld_pa_rng = readl_relaxed(base + REG_MMU_VLD_PA_RNG);
+       do {
+               if (!data->plat_data->banks_enable[i])
+                       continue;
+               base = data->bank[i].base;
+               reg->int_control[i] = readl_relaxed(base + REG_MMU_INT_CONTROL0);
+               reg->int_main_control[i] = readl_relaxed(base + REG_MMU_INT_MAIN_CONTROL);
+               reg->ivrp_paddr[i] = readl_relaxed(base + REG_MMU_IVRP_PADDR);
+       } while (++i < data->plat_data->banks_num);
        clk_disable_unprepare(data->bclk);
        return 0;
 }
@@ -1014,9 +1335,9 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)
 {
        struct mtk_iommu_data *data = dev_get_drvdata(dev);
        struct mtk_iommu_suspend_reg *reg = &data->reg;
-       struct mtk_iommu_domain *m4u_dom = data->m4u_dom;
-       void __iomem *base = data->base;
-       int ret;
+       struct mtk_iommu_domain *m4u_dom;
+       void __iomem *base;
+       int ret, i = 0;
 
        ret = clk_prepare_enable(data->bclk);
        if (ret) {
@@ -1028,18 +1349,26 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)
         * Uppon first resume, only enable the clk and return, since the values of the
         * registers are not yet set.
         */
-       if (!m4u_dom)
+       if (!reg->wr_len_ctrl)
                return 0;
 
+       base = data->bank[i].base;
        writel_relaxed(reg->wr_len_ctrl, base + REG_MMU_WR_LEN_CTRL);
        writel_relaxed(reg->misc_ctrl, base + REG_MMU_MISC_CTRL);
        writel_relaxed(reg->dcm_dis, base + REG_MMU_DCM_DIS);
        writel_relaxed(reg->ctrl_reg, base + REG_MMU_CTRL_REG);
-       writel_relaxed(reg->int_control0, base + REG_MMU_INT_CONTROL0);
-       writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL);
-       writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR);
        writel_relaxed(reg->vld_pa_rng, base + REG_MMU_VLD_PA_RNG);
-       writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK, base + REG_MMU_PT_BASE_ADDR);
+       do {
+               m4u_dom = data->bank[i].m4u_dom;
+               if (!data->plat_data->banks_enable[i] || !m4u_dom)
+                       continue;
+               base = data->bank[i].base;
+               writel_relaxed(reg->int_control[i], base + REG_MMU_INT_CONTROL0);
+               writel_relaxed(reg->int_main_control[i], base + REG_MMU_INT_MAIN_CONTROL);
+               writel_relaxed(reg->ivrp_paddr[i], base + REG_MMU_IVRP_PADDR);
+               writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
+                      base + REG_MMU_PT_BASE_ADDR);
+       } while (++i < data->plat_data->banks_num);
 
        /*
         * Users may allocate dma buffer before they call pm_runtime_get,
@@ -1058,18 +1387,24 @@ static const struct dev_pm_ops mtk_iommu_pm_ops = {
 
 static const struct mtk_iommu_plat_data mt2712_data = {
        .m4u_plat     = M4U_MT2712,
-       .flags        = HAS_4GB_MODE | HAS_BCLK | HAS_VLD_PA_RNG | SHARE_PGTABLE,
+       .flags        = HAS_4GB_MODE | HAS_BCLK | HAS_VLD_PA_RNG | SHARE_PGTABLE |
+                       MTK_IOMMU_TYPE_MM,
        .hw_list      = &m4ulist,
        .inv_sel_reg  = REG_MMU_INV_SEL_GEN1,
        .iova_region  = single_domain,
+       .banks_num    = 1,
+       .banks_enable = {true},
        .iova_region_nr = ARRAY_SIZE(single_domain),
        .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}},
 };
 
 static const struct mtk_iommu_plat_data mt6779_data = {
        .m4u_plat      = M4U_MT6779,
-       .flags         = HAS_SUB_COMM | OUT_ORDER_WR_EN | WR_THROT_EN,
+       .flags         = HAS_SUB_COMM_2BITS | OUT_ORDER_WR_EN | WR_THROT_EN |
+                        MTK_IOMMU_TYPE_MM,
        .inv_sel_reg   = REG_MMU_INV_SEL_GEN2,
+       .banks_num    = 1,
+       .banks_enable = {true},
        .iova_region   = single_domain,
        .iova_region_nr = ARRAY_SIZE(single_domain),
        .larbid_remap  = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}},
@@ -1077,8 +1412,10 @@ static const struct mtk_iommu_plat_data mt6779_data = {
 
 static const struct mtk_iommu_plat_data mt8167_data = {
        .m4u_plat     = M4U_MT8167,
-       .flags        = RESET_AXI | HAS_LEGACY_IVRP_PADDR,
+       .flags        = RESET_AXI | HAS_LEGACY_IVRP_PADDR | MTK_IOMMU_TYPE_MM,
        .inv_sel_reg  = REG_MMU_INV_SEL_GEN1,
+       .banks_num    = 1,
+       .banks_enable = {true},
        .iova_region  = single_domain,
        .iova_region_nr = ARRAY_SIZE(single_domain),
        .larbid_remap = {{0}, {1}, {2}}, /* Linear mapping. */
@@ -1087,8 +1424,10 @@ static const struct mtk_iommu_plat_data mt8167_data = {
 static const struct mtk_iommu_plat_data mt8173_data = {
        .m4u_plat     = M4U_MT8173,
        .flags        = HAS_4GB_MODE | HAS_BCLK | RESET_AXI |
-                       HAS_LEGACY_IVRP_PADDR,
+                       HAS_LEGACY_IVRP_PADDR | MTK_IOMMU_TYPE_MM,
        .inv_sel_reg  = REG_MMU_INV_SEL_GEN1,
+       .banks_num    = 1,
+       .banks_enable = {true},
        .iova_region  = single_domain,
        .iova_region_nr = ARRAY_SIZE(single_domain),
        .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}}, /* Linear mapping. */
@@ -1096,31 +1435,100 @@ static const struct mtk_iommu_plat_data mt8173_data = {
 
 static const struct mtk_iommu_plat_data mt8183_data = {
        .m4u_plat     = M4U_MT8183,
-       .flags        = RESET_AXI,
+       .flags        = RESET_AXI | MTK_IOMMU_TYPE_MM,
        .inv_sel_reg  = REG_MMU_INV_SEL_GEN1,
+       .banks_num    = 1,
+       .banks_enable = {true},
        .iova_region  = single_domain,
        .iova_region_nr = ARRAY_SIZE(single_domain),
        .larbid_remap = {{0}, {4}, {5}, {6}, {7}, {2}, {3}, {1}},
 };
 
+static const struct mtk_iommu_plat_data mt8186_data_mm = {
+       .m4u_plat       = M4U_MT8186,
+       .flags          = HAS_BCLK | HAS_SUB_COMM_2BITS | OUT_ORDER_WR_EN |
+                         WR_THROT_EN | IOVA_34_EN | MTK_IOMMU_TYPE_MM,
+       .larbid_remap   = {{0}, {1, MTK_INVALID_LARBID, 8}, {4}, {7}, {2}, {9, 11, 19, 20},
+                          {MTK_INVALID_LARBID, 14, 16},
+                          {MTK_INVALID_LARBID, 13, MTK_INVALID_LARBID, 17}},
+       .inv_sel_reg    = REG_MMU_INV_SEL_GEN2,
+       .banks_num      = 1,
+       .banks_enable   = {true},
+       .iova_region    = mt8192_multi_dom,
+       .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom),
+};
+
 static const struct mtk_iommu_plat_data mt8192_data = {
        .m4u_plat       = M4U_MT8192,
-       .flags          = HAS_BCLK | HAS_SUB_COMM | OUT_ORDER_WR_EN |
-                         WR_THROT_EN | IOVA_34_EN,
+       .flags          = HAS_BCLK | HAS_SUB_COMM_2BITS | OUT_ORDER_WR_EN |
+                         WR_THROT_EN | IOVA_34_EN | MTK_IOMMU_TYPE_MM,
        .inv_sel_reg    = REG_MMU_INV_SEL_GEN2,
+       .banks_num      = 1,
+       .banks_enable   = {true},
        .iova_region    = mt8192_multi_dom,
        .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom),
        .larbid_remap   = {{0}, {1}, {4, 5}, {7}, {2}, {9, 11, 19, 20},
                           {0, 14, 16}, {0, 13, 18, 17}},
 };
 
+static const struct mtk_iommu_plat_data mt8195_data_infra = {
+       .m4u_plat         = M4U_MT8195,
+       .flags            = WR_THROT_EN | DCM_DISABLE | STD_AXI_MODE | PM_CLK_AO |
+                           MTK_IOMMU_TYPE_INFRA | IFA_IOMMU_PCIE_SUPPORT,
+       .pericfg_comp_str = "mediatek,mt8195-pericfg_ao",
+       .inv_sel_reg      = REG_MMU_INV_SEL_GEN2,
+       .banks_num        = 5,
+       .banks_enable     = {true, false, false, false, true},
+       .banks_portmsk    = {[0] = GENMASK(19, 16),     /* PCIe */
+                            [4] = GENMASK(31, 20),     /* USB */
+                           },
+       .iova_region      = single_domain,
+       .iova_region_nr   = ARRAY_SIZE(single_domain),
+};
+
+static const struct mtk_iommu_plat_data mt8195_data_vdo = {
+       .m4u_plat       = M4U_MT8195,
+       .flags          = HAS_BCLK | HAS_SUB_COMM_2BITS | OUT_ORDER_WR_EN |
+                         WR_THROT_EN | IOVA_34_EN | SHARE_PGTABLE | MTK_IOMMU_TYPE_MM,
+       .hw_list        = &m4ulist,
+       .inv_sel_reg    = REG_MMU_INV_SEL_GEN2,
+       .banks_num      = 1,
+       .banks_enable   = {true},
+       .iova_region    = mt8192_multi_dom,
+       .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom),
+       .larbid_remap   = {{2, 0}, {21}, {24}, {7}, {19}, {9, 10, 11},
+                          {13, 17, 15/* 17b */, 25}, {5}},
+};
+
+static const struct mtk_iommu_plat_data mt8195_data_vpp = {
+       .m4u_plat       = M4U_MT8195,
+       .flags          = HAS_BCLK | HAS_SUB_COMM_3BITS | OUT_ORDER_WR_EN |
+                         WR_THROT_EN | IOVA_34_EN | SHARE_PGTABLE | MTK_IOMMU_TYPE_MM,
+       .hw_list        = &m4ulist,
+       .inv_sel_reg    = REG_MMU_INV_SEL_GEN2,
+       .banks_num      = 1,
+       .banks_enable   = {true},
+       .iova_region    = mt8192_multi_dom,
+       .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom),
+       .larbid_remap   = {{1}, {3},
+                          {22, MTK_INVALID_LARBID, MTK_INVALID_LARBID, MTK_INVALID_LARBID, 23},
+                          {8}, {20}, {12},
+                          /* 16: 16a; 29: 16b; 30: CCUtop0; 31: CCUtop1 */
+                          {14, 16, 29, 26, 30, 31, 18},
+                          {4, MTK_INVALID_LARBID, MTK_INVALID_LARBID, MTK_INVALID_LARBID, 6}},
+};
+
 static const struct of_device_id mtk_iommu_of_ids[] = {
        { .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data},
        { .compatible = "mediatek,mt6779-m4u", .data = &mt6779_data},
        { .compatible = "mediatek,mt8167-m4u", .data = &mt8167_data},
        { .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data},
        { .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data},
+       { .compatible = "mediatek,mt8186-iommu-mm",    .data = &mt8186_data_mm}, /* mm: m4u */
        { .compatible = "mediatek,mt8192-m4u", .data = &mt8192_data},
+       { .compatible = "mediatek,mt8195-iommu-infra", .data = &mt8195_data_infra},
+       { .compatible = "mediatek,mt8195-iommu-vdo",   .data = &mt8195_data_vdo},
+       { .compatible = "mediatek,mt8195-iommu-vpp",   .data = &mt8195_data_vpp},
        {}
 };