From: Stephen Boyd <swboyd@chromium.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Douglas Anderson <dianders@chromium.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 v5 25/32] iommu/mtk: Migrate to aggregate driver Date: Thu, 6 Jan 2022 13:45:48 -0800 [thread overview] Message-ID: <20220106214556.2461363-26-swboyd@chromium.org> (raw) In-Reply-To: <20220106214556.2461363-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>, Douglas Anderson <dianders@chromium.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 v5 25/32] iommu/mtk: Migrate to aggregate driver Date: Thu, 6 Jan 2022 13:45:48 -0800 [thread overview] Message-ID: <20220106214556.2461363-26-swboyd@chromium.org> (raw) In-Reply-To: <20220106214556.2461363-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
next prev parent reply other threads:[~2022-01-06 21:47 UTC|newest] Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-06 21:45 [PATCH v5 00/32] component: Make into an aggregate bus Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 01/32] component: Replace most references to 'master' with 'aggregate device' Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 02/32] component: Introduce the aggregate bus_type Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 03/32] component: Move struct aggregate_device out to header file Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-07 13:07 ` Jani Nikula 2022-01-07 20:12 ` Stephen Boyd 2022-01-10 11:23 ` Jani Nikula 2022-01-06 21:45 ` [PATCH v5 04/32] component: Add {bind, unbind}_component() ops that take aggregate device Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 04/32] component: Add {bind,unbind}_component() " Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 05/32] drm/of: Add a drm_of_aggregate_probe() API Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 06/32] drm/msm: Migrate to aggregate driver Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 07/32] drm/komeda: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 08/32] drm/arm/hdlcd: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 09/32] drm/malidp: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 10/32] drm/armada: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 11/32] drm/etnaviv: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 12/32] drm/kirin: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 13/32] drm/exynos: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 14/32] drm/imx: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 15/32] drm/ingenic: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 16/32] drm/mcde: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 17/32] drm/mediatek: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 18/32] drm/meson: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 19/32] drm/omap: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 20/32] drm/rockchip: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 21/32] drm/sti: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 22/32] drm/sun4i: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 23/32] drm/tilcdc: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 24/32] drm/vc4: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd [this message] 2022-01-06 21:45 ` [PATCH v5 25/32] iommu/mtk: " Stephen Boyd 2022-01-11 12:22 ` Yong Wu 2022-01-11 12:22 ` Yong Wu 2022-01-11 12:22 ` Yong Wu 2022-01-12 0:27 ` Stephen Boyd 2022-01-12 0:27 ` Stephen Boyd 2022-01-12 0:27 ` Stephen Boyd 2022-01-12 9:09 ` Yong Wu 2022-01-12 9:09 ` Yong Wu 2022-01-12 9:09 ` Yong Wu 2022-01-12 9:09 ` Yong Wu 2022-01-13 4:25 ` Stephen Boyd 2022-01-13 4:25 ` Stephen Boyd 2022-01-13 4:25 ` Stephen Boyd 2022-01-13 4:25 ` Stephen Boyd 2022-01-14 9:06 ` Yong Wu 2022-01-14 9:06 ` Yong Wu 2022-01-14 9:06 ` Yong Wu 2022-01-14 9:06 ` Yong Wu 2022-01-14 21:30 ` Stephen Boyd 2022-01-14 21:30 ` Stephen Boyd 2022-01-14 21:30 ` Stephen Boyd 2022-01-14 21:30 ` Stephen Boyd 2022-01-15 7:39 ` Yong Wu 2022-01-15 7:39 ` Yong Wu 2022-01-15 7:39 ` Yong Wu 2022-01-15 7:39 ` Yong Wu 2022-01-15 7:50 ` Stephen Boyd 2022-01-15 7:50 ` Stephen Boyd 2022-01-15 7:50 ` Stephen Boyd 2022-01-15 7:50 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 26/32] mei: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 27/32] power: supply: ab8500: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 28/32] fbdev: omap2: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 29/32] sound: hdac: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 30/32] ASoC: codecs: wcd938x: " Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 31/32] component: Get rid of drm_of_component_probe() Stephen Boyd 2022-01-06 21:45 ` Stephen Boyd 2022-01-06 21:45 ` [PATCH v5 32/32] component: Remove component_master_ops and friends Stephen Boyd 2022-01-06 21:45 ` 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=20220106214556.2461363-26-swboyd@chromium.org \ --to=swboyd@chromium.org \ --cc=daniel.vetter@ffwll.ch \ --cc=dianders@chromium.org \ --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=robdclark@gmail.com \ --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: linkBe 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.