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>,
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>,
David Airlie <airlied@linux.ie>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>
Cc: Evan Green <evgreen@chromium.org>,
Robin Murphy <robin.murphy@arm.com>,
Tomasz Figa <tfiga@chromium.org>,
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>, <yong.wu@mediatek.com>,
<youlin.pei@mediatek.com>, Matthias Kaehlcke <mka@chromium.org>,
<anan.sun@mediatek.com>, <yi.kuo@mediatek.com>,
<acourbot@chromium.org>, <linux-media@vger.kernel.org>,
<dri-devel@lists.freedesktop.org>,
Daniel Vetter <daniel@ffwll.ch>,
Chun-Kuang Hu <chunkuang.hu@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
Tiffany Lin <tiffany.lin@mediatek.com>,
"Dafna Hirschfeld" <dafna.hirschfeld@collabora.com>,
Hsin-Yi Wang <hsinyi@chromium.org>,
Eizan Miyamoto <eizan@chromium.org>, <anthony.huang@mediatek.com>,
Frank Wunderlich <frank-w@public-files.de>,
<mingyuan.ma@mediatek.com>, <yf.wang@mediatek.com>,
<libo.kang@mediatek.com>
Subject: [PATCH v9 05/15] iommu/mediatek: Add device_link between the consumer and the larb devices
Date: Fri, 12 Nov 2021 18:54:59 +0800 [thread overview]
Message-ID: <20211112105509.12010-6-yong.wu@mediatek.com> (raw)
In-Reply-To: <20211112105509.12010-1-yong.wu@mediatek.com>
MediaTek IOMMU-SMI diagram is like below. 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.
When device_link_add, I add the flag DL_FLAG_STATELESS to avoid calling
pm_runtime_xx to keep the original status of clocks. It can avoid two
issues:
1) Display HW show fastlogo abnormally reported in [1]. At the beggining,
all the clocks are enabled before entering kernel, but the clocks for
display HW(always in larb0) will be gated after clk_enable and clk_disable
called from device_link_add(->pm_runtime_resume) and rpm_idle. The clock
operation happened before display driver probe. At that time, the display
HW will be abnormal.
2) A deadlock issue reported in [2]. Use DL_FLAG_STATELESS to skip
pm_runtime_xx to avoid the deadlock.
Corresponding, DL_FLAG_AUTOREMOVE_CONSUMER can't be added, then
device_link_removed should be added explicitly.
Meanwhile, Currently we don't have a device connect with 2 larbs at the
same time. Disallow this case, print the error log.
[1] https://lore.kernel.org/linux-mediatek/1564213888.22908.4.camel@mhfsdcap03/
[2] https://lore.kernel.org/patchwork/patch/1086569/
Suggested-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Tested-by: Frank Wunderlich <frank-w@public-files.de> # BPI-R2/MT7623
---
drivers/iommu/mtk_iommu.c | 30 ++++++++++++++++++++++++++++++
drivers/iommu/mtk_iommu_v1.c | 29 ++++++++++++++++++++++++++++-
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 0033c0634e5e..5fed0b64ddd0 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -560,22 +560,52 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data;
+ struct device_link *link;
+ struct device *larbdev;
+ unsigned int larbid, larbidx, i;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return ERR_PTR(-ENODEV); /* Not a iommu client device */
data = dev_iommu_priv_get(dev);
+ /*
+ * 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]);
+ for (i = 1; i < fwspec->num_ids; i++) {
+ larbidx = MTK_M4U_TO_LARB(fwspec->ids[i]);
+ if (larbid != larbidx) {
+ dev_err(dev, "Can only use one larb. Fail@larb%d-%d.\n",
+ larbid, larbidx);
+ return ERR_PTR(-EINVAL);
+ }
+ }
+ larbdev = data->larb_imu[larbid].dev;
+ link = device_link_add(dev, larbdev,
+ DL_FLAG_PM_RUNTIME | DL_FLAG_STATELESS);
+ if (!link)
+ dev_err(dev, "Unable to link %s\n", dev_name(larbdev));
return &data->iommu;
}
static void mtk_iommu_release_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
+ struct mtk_iommu_data *data;
+ struct device *larbdev;
+ unsigned int larbid;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
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);
+
iommu_fwspec_free(dev);
}
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index 4089077256f4..4052aad75a81 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -423,7 +423,9 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct of_phandle_args iommu_spec;
struct mtk_iommu_data *data;
- int err, idx = 0;
+ int err, idx = 0, larbid, larbidx;
+ struct device_link *link;
+ struct device *larbdev;
/*
* In the deferred case, free the existed fwspec.
@@ -453,6 +455,23 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
data = dev_iommu_priv_get(dev);
+ /* Link the consumer device with the smi-larb device(supplier) */
+ larbid = mt2701_m4u_to_larb(fwspec->ids[0]);
+ for (idx = 1; idx < fwspec->num_ids; idx++) {
+ larbidx = mt2701_m4u_to_larb(fwspec->ids[idx]);
+ if (larbid != larbidx) {
+ dev_err(dev, "Can only use one larb. Fail@larb%d-%d.\n",
+ larbid, larbidx);
+ return ERR_PTR(-EINVAL);
+ }
+ }
+
+ larbdev = data->larb_imu[larbid].dev;
+ link = device_link_add(dev, larbdev,
+ DL_FLAG_PM_RUNTIME | DL_FLAG_STATELESS);
+ if (!link)
+ dev_err(dev, "Unable to link %s\n", dev_name(larbdev));
+
return &data->iommu;
}
@@ -473,10 +492,18 @@ static void mtk_iommu_probe_finalize(struct device *dev)
static void mtk_iommu_release_device(struct device *dev)
{
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
+ struct mtk_iommu_data *data;
+ struct device *larbdev;
+ unsigned int larbid;
if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return;
+ data = dev_iommu_priv_get(dev);
+ larbid = mt2701_m4u_to_larb(fwspec->ids[0]);
+ larbdev = data->larb_imu[larbid].dev;
+ device_link_remove(dev, larbdev);
+
iommu_fwspec_free(dev);
}
--
2.18.0
next prev parent reply other threads:[~2021-11-12 10:56 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-12 10:54 [PATCH v9 00/15] Clean up "mediatek,larb" Yong Wu
2021-11-12 10:54 ` [PATCH v9 01/15] dt-binding: mediatek: Get rid of mediatek,larb for multimedia HW Yong Wu
2022-01-11 10:57 ` [PATCH v9 01/15] dt-binding: mediatek: Get rid of mediatek, larb " AngeloGioacchino Del Regno
2021-11-12 10:54 ` [PATCH v9 02/15] iommu/mediatek-v1: Free the existed fwspec if the master dev already has Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:54 ` [PATCH v9 03/15] iommu/mediatek: Return ENODEV if the device is NULL Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:54 ` [PATCH v9 04/15] iommu/mediatek: Add probe_defer for smi-larb Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:54 ` Yong Wu [this message]
2022-01-11 10:57 ` [PATCH v9 05/15] iommu/mediatek: Add device_link between the consumer and the larb devices AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 06/15] media: mtk-jpeg: Get rid of mtk_smi_larb_get/put Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 07/15] media: mtk-mdp: " Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 08/15] drm/mediatek: Add pm runtime support for ovl and rdma Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 09/15] drm/mediatek: Get rid of mtk_smi_larb_get/put Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 10/15] media: mtk-vcodec: " Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 11/15] media: mtk-vcodec: dec: Remove mtk_vcodec_release_dec_pm Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 12/15] media: mtk-vcodec: enc: Remove mtk_vcodec_release_enc_pm Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2022-01-13 10:11 ` AngeloGioacchino Del Regno
2022-01-13 10:15 ` Hans Verkuil
2022-01-13 10:17 ` AngeloGioacchino Del Regno
2022-01-13 16:10 ` Matthias Brugger
2022-01-17 9:41 ` Yong Wu
2022-01-21 11:56 ` Hans Verkuil
2021-11-12 10:55 ` [PATCH v9 13/15] memory: mtk-smi: Get rid of mtk_smi_larb_get/put Yong Wu
2022-01-11 10:57 ` AngeloGioacchino Del Regno
2021-11-12 10:55 ` [PATCH v9 14/15] arm: dts: mediatek: Get rid of mediatek,larb for MM nodes Yong Wu
2021-11-12 10:55 ` [PATCH v9 15/15] arm64: " Yong Wu
2022-01-11 10:57 ` [PATCH v9 15/15] arm64: dts: mediatek: Get rid of mediatek, larb " AngeloGioacchino Del Regno
2021-12-06 11:52 ` [PATCH v9 00/15] Clean up "mediatek,larb" Joerg Roedel
2021-12-06 12:33 ` Hans Verkuil
2021-12-06 13:48 ` Joerg Roedel
2021-12-06 12:23 ` Hans Verkuil
2021-12-06 13:06 ` Hsin-Yi Wang
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=20211112105509.12010-6-yong.wu@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=acourbot@chromium.org \
--cc=airlied@linux.ie \
--cc=anan.sun@mediatek.com \
--cc=anthony.huang@mediatek.com \
--cc=chunkuang.hu@kernel.org \
--cc=dafna.hirschfeld@collabora.com \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=eizan@chromium.org \
--cc=evgreen@chromium.org \
--cc=frank-w@public-files.de \
--cc=hsinyi@chromium.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=krzysztof.kozlowski@canonical.com \
--cc=libo.kang@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=mingyuan.ma@mediatek.com \
--cc=mka@chromium.org \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@chromium.org \
--cc=tiffany.lin@mediatek.com \
--cc=will.deacon@arm.com \
--cc=yf.wang@mediatek.com \
--cc=yi.kuo@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).