All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Boyd <swboyd@chromium.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Saravana Kannan <saravanak@google.com>,
	Will Deacon <will@kernel.org>,
	"Rafael J. Wysocki" <rafael@kernel.org>,
	linux-arm-msm@vger.kernel.org, Joerg Roedel <joro@8bytes.org>,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Russell King <rmk+kernel@arm.linux.org.uk>,
	freedreno@lists.freedesktop.org, Yong Wu <yong.wu@mediatek.com>
Subject: [PATCH v4 26/34] iommu/mtk: Migrate to aggregate driver
Date: Thu,  2 Dec 2021 14:27:24 -0800	[thread overview]
Message-ID: <20211202222732.2453851-27-swboyd@chromium.org> (raw)
In-Reply-To: <20211202222732.2453851-1-swboyd@chromium.org>

Use an aggregate driver instead of component ops so that we can get
proper driver probe ordering of the aggregate device with respect to all
the component devices that make up the aggregate device.

Cc: Yong Wu <yong.wu@mediatek.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Will Deacon <will@kernel.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Saravana Kannan <saravanak@google.com>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
 drivers/iommu/mtk_iommu.c    | 14 +++++++++-----
 drivers/iommu/mtk_iommu.h    |  6 ++++--
 drivers/iommu/mtk_iommu_v1.c | 14 +++++++++-----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 25b834104790..8e722898cbe2 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -752,9 +752,13 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
 	return 0;
 }
 
-static const struct component_master_ops mtk_iommu_com_ops = {
-	.bind		= mtk_iommu_bind,
-	.unbind		= mtk_iommu_unbind,
+static struct aggregate_driver mtk_iommu_aggregate_driver = {
+	.probe		= mtk_iommu_bind,
+	.remove		= mtk_iommu_unbind,
+	.driver		= {
+		.name	= "mtk_iommu_agg",
+		.owner	= THIS_MODULE,
+	},
 };
 
 static int mtk_iommu_probe(struct platform_device *pdev)
@@ -895,7 +899,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 			goto out_list_del;
 	}
 
-	ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
+	ret = component_aggregate_register(dev, &mtk_iommu_aggregate_driver, match);
 	if (ret)
 		goto out_bus_set_null;
 	return ret;
@@ -928,7 +932,7 @@ static int mtk_iommu_remove(struct platform_device *pdev)
 	device_link_remove(data->smicomm_dev, &pdev->dev);
 	pm_runtime_disable(&pdev->dev);
 	devm_free_irq(&pdev->dev, data->irq, data);
-	component_master_del(&pdev->dev, &mtk_iommu_com_ops);
+	component_aggregate_unregister(&pdev->dev, &mtk_iommu_aggregate_driver);
 	return 0;
 }
 
diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h
index f81fa8862ed0..064fd4f4eade 100644
--- a/drivers/iommu/mtk_iommu.h
+++ b/drivers/iommu/mtk_iommu.h
@@ -94,15 +94,17 @@ static inline void release_of(struct device *dev, void *data)
 	of_node_put(data);
 }
 
-static inline int mtk_iommu_bind(struct device *dev)
+static inline int mtk_iommu_bind(struct aggregate_device *adev)
 {
+	struct device *dev = adev->parent;
 	struct mtk_iommu_data *data = dev_get_drvdata(dev);
 
 	return component_bind_all(dev, &data->larb_imu);
 }
 
-static inline void mtk_iommu_unbind(struct device *dev)
+static inline void mtk_iommu_unbind(struct aggregate_device *adev)
 {
+	struct device *dev = adev->parent;
 	struct mtk_iommu_data *data = dev_get_drvdata(dev);
 
 	component_unbind_all(dev, &data->larb_imu);
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index be22fcf988ce..5fb29058a165 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -534,9 +534,13 @@ static const struct of_device_id mtk_iommu_of_ids[] = {
 	{}
 };
 
-static const struct component_master_ops mtk_iommu_com_ops = {
-	.bind		= mtk_iommu_bind,
-	.unbind		= mtk_iommu_unbind,
+static struct aggregate_driver mtk_iommu_aggregate_driver = {
+	.probe		= mtk_iommu_bind,
+	.remove		= mtk_iommu_unbind,
+	.driver		= {
+		.name	= "mtk_iommu_agg",
+		.owner	= THIS_MODULE,
+	},
 };
 
 static int mtk_iommu_probe(struct platform_device *pdev)
@@ -624,7 +628,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 			goto out_dev_unreg;
 	}
 
-	ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
+	ret = component_aggregate_register(dev, &mtk_iommu_aggregate_driver, match);
 	if (ret)
 		goto out_bus_set_null;
 	return ret;
@@ -650,7 +654,7 @@ static int mtk_iommu_remove(struct platform_device *pdev)
 
 	clk_disable_unprepare(data->bclk);
 	devm_free_irq(&pdev->dev, data->irq, data);
-	component_master_del(&pdev->dev, &mtk_iommu_com_ops);
+	component_aggregate_unregister(&pdev->dev, &mtk_iommu_aggregate_driver);
 	return 0;
 }
 
-- 
https://chromeos.dev


WARNING: multiple messages have this Message-ID (diff)
From: Stephen Boyd <swboyd@chromium.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org,
	Yong Wu <yong.wu@mediatek.com>, Joerg Roedel <joro@8bytes.org>,
	Will Deacon <will@kernel.org>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	"Rafael J. Wysocki" <rafael@kernel.org>,
	Rob Clark <robdclark@gmail.com>,
	Russell King <rmk+kernel@arm.linux.org.uk>,
	Saravana Kannan <saravanak@google.com>
Subject: [PATCH v4 26/34] iommu/mtk: Migrate to aggregate driver
Date: Thu,  2 Dec 2021 14:27:24 -0800	[thread overview]
Message-ID: <20211202222732.2453851-27-swboyd@chromium.org> (raw)
In-Reply-To: <20211202222732.2453851-1-swboyd@chromium.org>

Use an aggregate driver instead of component ops so that we can get
proper driver probe ordering of the aggregate device with respect to all
the component devices that make up the aggregate device.

Cc: Yong Wu <yong.wu@mediatek.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Will Deacon <will@kernel.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Saravana Kannan <saravanak@google.com>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
 drivers/iommu/mtk_iommu.c    | 14 +++++++++-----
 drivers/iommu/mtk_iommu.h    |  6 ++++--
 drivers/iommu/mtk_iommu_v1.c | 14 +++++++++-----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 25b834104790..8e722898cbe2 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -752,9 +752,13 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
 	return 0;
 }
 
-static const struct component_master_ops mtk_iommu_com_ops = {
-	.bind		= mtk_iommu_bind,
-	.unbind		= mtk_iommu_unbind,
+static struct aggregate_driver mtk_iommu_aggregate_driver = {
+	.probe		= mtk_iommu_bind,
+	.remove		= mtk_iommu_unbind,
+	.driver		= {
+		.name	= "mtk_iommu_agg",
+		.owner	= THIS_MODULE,
+	},
 };
 
 static int mtk_iommu_probe(struct platform_device *pdev)
@@ -895,7 +899,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 			goto out_list_del;
 	}
 
-	ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
+	ret = component_aggregate_register(dev, &mtk_iommu_aggregate_driver, match);
 	if (ret)
 		goto out_bus_set_null;
 	return ret;
@@ -928,7 +932,7 @@ static int mtk_iommu_remove(struct platform_device *pdev)
 	device_link_remove(data->smicomm_dev, &pdev->dev);
 	pm_runtime_disable(&pdev->dev);
 	devm_free_irq(&pdev->dev, data->irq, data);
-	component_master_del(&pdev->dev, &mtk_iommu_com_ops);
+	component_aggregate_unregister(&pdev->dev, &mtk_iommu_aggregate_driver);
 	return 0;
 }
 
diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h
index f81fa8862ed0..064fd4f4eade 100644
--- a/drivers/iommu/mtk_iommu.h
+++ b/drivers/iommu/mtk_iommu.h
@@ -94,15 +94,17 @@ static inline void release_of(struct device *dev, void *data)
 	of_node_put(data);
 }
 
-static inline int mtk_iommu_bind(struct device *dev)
+static inline int mtk_iommu_bind(struct aggregate_device *adev)
 {
+	struct device *dev = adev->parent;
 	struct mtk_iommu_data *data = dev_get_drvdata(dev);
 
 	return component_bind_all(dev, &data->larb_imu);
 }
 
-static inline void mtk_iommu_unbind(struct device *dev)
+static inline void mtk_iommu_unbind(struct aggregate_device *adev)
 {
+	struct device *dev = adev->parent;
 	struct mtk_iommu_data *data = dev_get_drvdata(dev);
 
 	component_unbind_all(dev, &data->larb_imu);
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index be22fcf988ce..5fb29058a165 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -534,9 +534,13 @@ static const struct of_device_id mtk_iommu_of_ids[] = {
 	{}
 };
 
-static const struct component_master_ops mtk_iommu_com_ops = {
-	.bind		= mtk_iommu_bind,
-	.unbind		= mtk_iommu_unbind,
+static struct aggregate_driver mtk_iommu_aggregate_driver = {
+	.probe		= mtk_iommu_bind,
+	.remove		= mtk_iommu_unbind,
+	.driver		= {
+		.name	= "mtk_iommu_agg",
+		.owner	= THIS_MODULE,
+	},
 };
 
 static int mtk_iommu_probe(struct platform_device *pdev)
@@ -624,7 +628,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 			goto out_dev_unreg;
 	}
 
-	ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match);
+	ret = component_aggregate_register(dev, &mtk_iommu_aggregate_driver, match);
 	if (ret)
 		goto out_bus_set_null;
 	return ret;
@@ -650,7 +654,7 @@ static int mtk_iommu_remove(struct platform_device *pdev)
 
 	clk_disable_unprepare(data->bclk);
 	devm_free_irq(&pdev->dev, data->irq, data);
-	component_master_del(&pdev->dev, &mtk_iommu_com_ops);
+	component_aggregate_unregister(&pdev->dev, &mtk_iommu_aggregate_driver);
 	return 0;
 }
 
-- 
https://chromeos.dev


  parent reply	other threads:[~2021-12-02 22:29 UTC|newest]

Thread overview: 86+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-02 22:26 [PATCH v4 00/34] component: Make into an aggregate bus Stephen Boyd
2021-12-02 22:26 ` Stephen Boyd
2021-12-02 22:26 ` [PATCH v4 01/34] component: Introduce struct aggregate_device Stephen Boyd
2021-12-02 22:26   ` Stephen Boyd
2021-12-21  9:28   ` Greg Kroah-Hartman
2021-12-21  9:28     ` Greg Kroah-Hartman
2022-01-06  2:11     ` Stephen Boyd
2022-01-06  2:11       ` Stephen Boyd
2021-12-21  9:29   ` Greg Kroah-Hartman
2021-12-21  9:29     ` Greg Kroah-Hartman
2022-01-06  2:17     ` Stephen Boyd
2022-01-06  2:17       ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 02/34] component: Remove most references to 'master' Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 03/34] component: Introduce the aggregate bus_type Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 04/34] component: Move struct aggregate_device out to header file Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 05/34] component: Add {bind,unbind}_component() ops that take aggregate device Stephen Boyd
2021-12-02 22:27   ` [PATCH v4 05/34] component: Add {bind, unbind}_component() " Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 06/34] drm/of: Add a drm_of_aggregate_probe() API Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 07/34] drm/msm: Migrate to aggregate driver Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 08/34] drm/komeda: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 09/34] drm/arm/hdlcd: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 10/34] drm/malidp: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 11/34] drm/armada: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 12/34] drm/etnaviv: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 13/34] drm/kirin: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 14/34] drm/exynos: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 15/34] drm/imx: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 16/34] drm/ingenic: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 17/34] drm/mcde: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 18/34] drm/mediatek: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 19/34] drm/meson: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 20/34] drm/omap: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 21/34] drm/rockchip: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 22/34] drm/sti: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 23/34] drm/sun4i: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 24/34] drm/tilcdc: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 25/34] drm/vc4: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` Stephen Boyd [this message]
2021-12-02 22:27   ` [PATCH v4 26/34] iommu/mtk: " Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 27/34] mei: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 28/34] power: supply: ab8500: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-03  1:50   ` Linus Walleij
2021-12-03  1:50     ` Linus Walleij
2021-12-02 22:27 ` [PATCH v4 29/34] fbdev: omap2: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 30/34] sound: hdac: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 31/34] ASoC: codecs: wcd938x: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 32/34] mei: pxp: " Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 33/34] component: Get rid of drm_of_component_probe() Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-02 22:27 ` [PATCH v4 34/34] component: Remove component_master_ops and friends Stephen Boyd
2021-12-02 22:27   ` Stephen Boyd
2021-12-03  1:51 ` [PATCH v4 00/34] component: Make into an aggregate bus Linus Walleij
2021-12-03  1:51   ` Linus Walleij
2021-12-07 18:22 ` Daniel Vetter
2021-12-07 18:22   ` Daniel Vetter
2021-12-13 21:43   ` Stephen Boyd
2021-12-13 21:43     ` Stephen Boyd

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=20211202222732.2453851-27-swboyd@chromium.org \
    --to=swboyd@chromium.org \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=joro@8bytes.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rafael@kernel.org \
    --cc=rmk+kernel@arm.linux.org.uk \
    --cc=saravanak@google.com \
    --cc=will@kernel.org \
    --cc=yong.wu@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.