linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>, <yong.wu@mediatek.com>,
	<youlin.pei@mediatek.com>,
	Nicolas Boichat <drinkcat@chromium.org>,
	Matthias Kaehlcke <mka@chromium.org>, <anan.sun@mediatek.com>,
	<cui.zhang@mediatek.com>, <chao.hao@mediatek.com>,
	<ming-fan.chen@mediatek.com>, <eizan@chromium.org>,
	<acourbot@chromium.org>
Subject: [PATCH v4 03/17] iommu/mediatek: Add probe_defer for smi-larb
Date: Sat, 30 May 2020 16:10:04 +0800	[thread overview]
Message-ID: <1590826218-23653-4-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1590826218-23653-1-git-send-email-yong.wu@mediatek.com>

The iommu consumer should use device_link to connect with the
smi-larb(supplier). then the smi-larb should run before the iommu
consumer. Here we delay the iommu driver until the smi driver is
ready, then all the iommu consumer always is after the smi driver.

When there is no this patch, if some consumer drivers run before
smi-larb, the supplier link_status is DL_DEV_NO_DRIVER(0) in the
device_link_add, then device_links_driver_bound will use WARN_ON
to complain that the link_status of supplier is not right.

This is a preparing patch for adding device_link.

Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
 drivers/iommu/mtk_iommu.c    | 8 +++++++-
 drivers/iommu/mtk_iommu_v1.c | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 2be96f1..7d8f3d0 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -643,6 +643,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 	for (i = 0; i < larb_nr; i++) {
 		struct device_node *larbnode;
 		struct platform_device *plarbdev;
+		bool larbdev_is_bound = false;
 		u32 id;
 
 		larbnode = of_parse_phandle(dev->of_node, "mediatek,larbs", i);
@@ -659,7 +660,12 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 			id = i;
 
 		plarbdev = of_find_device_by_node(larbnode);
-		if (!plarbdev) {
+		if (plarbdev) {
+			device_lock(&plarbdev->dev);
+			larbdev_is_bound = device_is_bound(&plarbdev->dev);
+			device_unlock(&plarbdev->dev);
+		}
+		if (!plarbdev || !larbdev_is_bound) {
 			of_node_put(larbnode);
 			return -EPROBE_DEFER;
 		}
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index 1245e0c..02858a0 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -591,10 +591,15 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 
 		plarbdev = of_find_device_by_node(larb_spec.np);
 		if (!plarbdev) {
+			bool larbdev_is_bound;
+
 			plarbdev = of_platform_device_create(
 						larb_spec.np, NULL,
 						platform_bus_type.dev_root);
-			if (!plarbdev) {
+			device_lock(&plarbdev->dev);
+			larbdev_is_bound = device_is_bound(&plarbdev->dev);
+			device_unlock(&plarbdev->dev);
+			if (!plarbdev || !larbdev_is_bound) {
 				of_node_put(larb_spec.np);
 				return -EPROBE_DEFER;
 			}
-- 
1.9.1

  parent reply	other threads:[~2020-05-30  8:12 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-30  8:10 [PATCH v4 00/17] Clean up "mediatek,larb" after adding device_link Yong Wu
2020-05-30  8:10 ` [PATCH v4 01/17] media: dt-binding: mtk-vcodec: Separating mtk-vcodec encode node Yong Wu
2020-06-09 21:21   ` Rob Herring
2020-06-10  6:46     ` Alexandre Courbot
2020-06-10  7:38       ` Tiffany Lin
2020-06-17  5:53         ` Tiffany Lin
2020-05-30  8:10 ` [PATCH v4 02/17] dt-binding: mediatek: Get rid of mediatek,larb for multimedia HW Yong Wu
2020-05-30  8:10 ` Yong Wu [this message]
2020-05-30  8:10 ` [PATCH v4 04/17] iommu/mediatek: Add device_link between the consumer and the larb devices Yong Wu
2020-05-30  8:10 ` [PATCH v4 05/17] memory: mtk-smi: Add device-link between smi-larb and smi-common Yong Wu
2020-05-30  8:10 ` [PATCH v4 06/17] media: mtk-jpeg: Get rid of mtk_smi_larb_get/put Yong Wu
2020-06-18  9:32   ` Yong Wu
2020-06-18 17:28     ` Rick Chang
2020-05-30  8:10 ` [PATCH v4 07/17] media: mtk-mdp: " Yong Wu
2020-05-30  8:10 ` [PATCH v4 08/17] media: mtk-vcodec: separate mtk-vcodec-enc node Yong Wu
2020-06-10  5:45   ` CK Hu
2020-06-10  6:13     ` Tiffany Lin
2020-05-30  8:10 ` [PATCH v4 09/17] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put Yong Wu
2020-06-10  5:47   ` CK Hu
2020-06-10  6:20     ` Tiffany Lin
2020-05-30  8:10 ` [PATCH v4 10/17] drm/mediatek: Add pm runtime support for ovl and rdma Yong Wu
2020-05-30 11:07   ` Chun-Kuang Hu
2020-05-30  8:10 ` [PATCH v4 11/17] drm/mediatek: Get rid of mtk_smi_larb_get/put Yong Wu
2020-05-30 11:08   ` Chun-Kuang Hu
2020-05-30  8:10 ` [PATCH v4 12/17] memory: mtk-smi: " Yong Wu
2020-05-30  8:10 ` [PATCH v4 13/17] iommu/mediatek: Use module_platform_driver Yong Wu
2020-05-30  8:10 ` [PATCH v4 14/17] memory: mtk-smi: Use device_is_bound to check if smi-common is ready Yong Wu
2020-05-30  8:10 ` [PATCH v4 15/17] arm: dts: mediatek: Get rid of mediatek,larb for MM nodes Yong Wu
2020-05-30  8:10 ` [PATCH v4 16/17] arm64: dts: mt8173: Separate mtk-vcodec-enc node Yong Wu
2020-05-30  8:10 ` [PATCH v4 17/17] arm64: dts: mediatek: Get rid of mediatek,larb for MM nodes 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=1590826218-23653-4-git-send-email-yong.wu@mediatek.com \
    --to=yong.wu@mediatek.com \
    --cc=acourbot@chromium.org \
    --cc=anan.sun@mediatek.com \
    --cc=chao.hao@mediatek.com \
    --cc=cui.zhang@mediatek.com \
    --cc=devicetree@vger.kernel.org \
    --cc=drinkcat@chromium.org \
    --cc=eizan@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=ming-fan.chen@mediatek.com \
    --cc=mka@chromium.org \
    --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=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).