MediaTek IOMMU don't have its power-domain. all the consumer connect
with smi-larb, then connect with smi-common.

        M4U
         |
    smi-common
         |
  -------------
  |         |    ...
  |         |
larb1     larb2
  |         |
vdec       venc

When the consumer works, it should enable the smi-larb's power which
also need enable the smi-common's power firstly.

Thus, First of all, use the device link connect the consumer and the
smi-larbs. then add device link between the smi-larb and smi-common.

This patch adds device_link between the consumer and the larbs.

Suggested-by: Tomasz Figa <[email protected]>
Signed-off-by: Yong Wu <[email protected]>
---
 drivers/iommu/mtk_iommu.c    | 12 ++++++++++++
 drivers/iommu/mtk_iommu_v1.c | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index f7599d8..7b70574 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -440,6 +440,9 @@ static int mtk_iommu_add_device(struct device *dev)
        struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
        struct mtk_iommu_data *data;
        struct iommu_group *group;
+       struct device_link *link;
+       struct device *larbdev;
+       unsigned int larbid;
 
        if (!fwspec || fwspec->ops != &mtk_iommu_ops)
                return -ENODEV; /* Not a iommu client device */
@@ -451,6 +454,15 @@ static int mtk_iommu_add_device(struct device *dev)
        if (IS_ERR(group))
                return PTR_ERR(group);
 
+       /* Link the consumer device with the smi-larb device(supplier) */
+       larbid = MTK_M4U_TO_LARB(fwspec->ids[0]);
+       larbdev = data->smi_imu.larb_imu[larbid].dev;
+       link = device_link_add(dev, larbdev,
+                              DL_FLAG_PM_RUNTIME |
+                              DL_FLAG_AUTOREMOVE_CONSUMER);
+       if (!link)
+               dev_err(dev, "Unable to link %s\n", dev_name(larbdev));
+
        iommu_group_put(group);
        return 0;
 }
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index c43c4a0..845e20b 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -423,7 +423,9 @@ static int mtk_iommu_add_device(struct device *dev)
        struct of_phandle_iterator it;
        struct mtk_iommu_data *data;
        struct iommu_group *group;
-       int err;
+       struct device_link *link;
+       struct device *larbdev;
+       int err, larbid;
 
        of_for_each_phandle(&it, err, dev->of_node, "iommus",
                        "#iommu-cells", 0) {
@@ -466,6 +468,15 @@ static int mtk_iommu_add_device(struct device *dev)
                return err;
        }
 
+       /* Link the consumer device with the smi-larb device(supplier) */
+       larbid = mt2701_m4u_to_larb(fwspec->ids[0]);
+       larbdev = data->smi_imu.larb_imu[larbid].dev;
+       link = device_link_add(dev, larbdev,
+                              DL_FLAG_PM_RUNTIME |
+                              DL_FLAG_AUTOREMOVE_CONSUMER);
+       if (!link)
+               dev_err(dev, "Unable to link %s\n", dev_name(larbdev));
+
        return iommu_device_link(&data->iommu, dev);
 }
 
-- 
1.9.1

Reply via email to