From: Yong Wu <yong.wu@mediatek.com>
To: Matthias Brugger <matthias.bgg@gmail.com>,
Joerg Roedel <joro@8bytes.org>, Rob Herring <robh+dt@kernel.org>
Cc: Evan Green <evgreen@chromium.org>,
Robin Murphy <robin.murphy@arm.com>,
Tomasz Figa <tfiga@google.com>, Will Deacon <will.deacon@arm.com>,
linux-mediatek@lists.infradead.org, srv_heupstream@mediatek.com,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
iommu@lists.linux-foundation.org, yingjoe.chen@mediatek.com,
yong.wu@mediatek.com, youlin.pei@mediatek.com,
Nicolas Boichat <drinkcat@chromium.org>,
anan.sun@mediatek.com
Subject: [PATCH v2 03/12] iommu/mediatek: Add device_link between the consumer and the larb devices
Date: Mon, 10 Jun 2019 20:55:04 +0800 [thread overview]
Message-ID: <1560171313-28299-4-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1560171313-28299-1-git-send-email-yong.wu@mediatek.com>
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 <tfiga@chromium.org>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
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
next prev parent reply other threads:[~2019-06-10 12:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 12:55 [PATCH v2 00/12] Clean up "mediatek,larb" after adding device_link Yong Wu
2019-06-10 12:55 ` [PATCH v2 01/12] dt-binding: mediatek: Get rid of mediatek,larb for multimedia HW Yong Wu
2019-06-10 12:55 ` [PATCH v2 02/12] iommu/mediatek: Add probe_defer for smi-larb Yong Wu
2019-06-19 13:52 ` Matthias Brugger
[not found] ` <a11fa818-cf62-cc24-2c41-4688fda5a88f-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-06-22 2:42 ` Yong Wu
2019-06-10 12:55 ` Yong Wu [this message]
2019-06-10 12:55 ` [PATCH v2 04/12] memory: mtk-smi: Add device-link between smi-larb and smi-common Yong Wu
2019-06-10 12:55 ` [PATCH v2 05/12] media: mtk-jpeg: Get rid of mtk_smi_larb_get/put Yong Wu
2019-06-20 15:20 ` Matthias Brugger
[not found] ` <6539751d-1751-f309-1c51-b3f9576c1b99-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-06-22 2:42 ` Yong Wu
2019-06-10 12:55 ` [PATCH v2 06/12] media: mtk-mdp: " Yong Wu
2019-06-10 12:55 ` [PATCH v2 07/12] media: mtk-vcodec: " Yong Wu
2019-06-10 12:55 ` [PATCH v2 08/12] drm/mediatek: " Yong Wu
2019-06-18 6:35 ` CK Hu
2019-06-18 12:14 ` Yong Wu
2019-06-10 12:55 ` [PATCH v2 10/12] iommu/mediatek: Use builtin_platform_driver Yong Wu
[not found] ` <1560171313-28299-1-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-06-10 12:55 ` [PATCH v2 09/12] memory: mtk-smi: Get rid of mtk_smi_larb_get/put Yong Wu
2019-06-10 12:55 ` [PATCH v2 11/12] arm: dts: mediatek: Get rid of mediatek, larb for MM nodes Yong Wu
2019-06-10 12:55 ` [PATCH v2 12/12] arm64: dts: mediatek: Get rid of mediatek,larb " Yong Wu
2019-07-23 2:31 ` [PATCH v2 00/12] Clean up "mediatek,larb" after adding device_link CK Hu
2019-07-27 7:51 ` Yong Wu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1560171313-28299-4-git-send-email-yong.wu@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=anan.sun@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=drinkcat@chromium.org \
--cc=evgreen@chromium.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@google.com \
--cc=will.deacon@arm.com \
--cc=yingjoe.chen@mediatek.com \
--cc=youlin.pei@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).