[PATCH v2 15/19] iommu/mediatek: Remove the usage of m4u_dom variable

[Chao Hao]

This patch will remove the usage of the m4u_dom variable.

We have already redefined mtk_iommu_domain structure and it
includes iommu_domain, so m4u_dom variable will not be used.

Signed-off-by: Chao Hao <chao....@mediatek.com>
---
 drivers/iommu/mtk_iommu.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index b1ce0a2df583..bfb1831afae9 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -107,6 +107,7 @@
  * Get the local arbiter ID and the portid within the larb arbiter
  * from mtk_m4u_id which is defined by MTK_M4U_ID.
  */
+#define MTK_M4U_ID(larb, port)         (((larb) << 5) | (port))
 #define MTK_M4U_TO_LARB(id)            (((id) >> 5) & 0xf)
 #define MTK_M4U_TO_PORT(id)            ((id) & 0x1f)
 
@@ -199,6 +200,22 @@ static u32 mtk_iommu_get_domain_id(struct device *dev)
        return get_domain_id(data, portid);
 }
 
+static struct iommu_domain *_get_mtk_domain(struct mtk_iommu_data *data,
+                                           u32 larbid, u32 portid)
+{
+       u32 domain_id;
+       u32 port_mask = MTK_M4U_ID(larbid, portid);
+       struct mtk_iommu_domain *dom;
+
+       domain_id = get_domain_id(data, port_mask);
+
+       list_for_each_entry(dom, &data->pgtable->m4u_dom_v2, list) {
+               if (dom->id == domain_id)
+                       return &dom->domain;
+       }
+       return NULL;
+}
+
 static struct mtk_iommu_domain *get_mtk_domain(struct device *dev)
 {
        struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv;
@@ -301,7 +318,7 @@ static const struct iommu_flush_ops mtk_iommu_flush_ops = {
 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;
+       struct iommu_domain *domain;
        u32 int_state, regval, fault_iova, fault_pa;
        unsigned int fault_larb, fault_port, sub_comm = 0;
        bool layer, write;
@@ -336,7 +353,8 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id)
 
        fault_larb = data->plat_data->larbid_remap[data->m4u_id][fault_larb];
 
-       if (report_iommu_fault(&dom->domain, data->dev, fault_iova,
+       domain = _get_mtk_domain(data, fault_larb, fault_port);
+       if (report_iommu_fault(domain, data->dev, fault_iova,
                               write ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ)) {
                dev_err_ratelimited(
                        data->dev,
@@ -506,16 +524,11 @@ static void mtk_iommu_domain_free(struct iommu_domain 
*domain)
 static int mtk_iommu_attach_device(struct iommu_domain *domain,
                                   struct device *dev)
 {
-       struct mtk_iommu_domain *dom = to_mtk_domain(domain);
        struct mtk_iommu_data *data = dev_iommu_fwspec_get(dev)->iommu_priv;
 
        if (!data)
                return -ENODEV;
 
-       /* Update the pgtable base address register of the M4U HW */
-       if (!data->m4u_dom)
-               data->m4u_dom = dom;
-
        mtk_iommu_config(data, dev, true);
        return 0;
 }
-- 
2.18.0
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu