All of lore.kernel.org
 help / color / mirror / Atom feed
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,
	Tomas Winkler <tomas.winkler@intel.com>,
	Arnd Bergmann <arnd@arndb.de>,
	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 27/34] mei: Migrate to aggregate driver
Date: Thu,  2 Dec 2021 14:27:25 -0800	[thread overview]
Message-ID: <20211202222732.2453851-28-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: Tomas Winkler <tomas.winkler@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.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/misc/mei/hdcp/mei_hdcp.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
index ec2a4fce8581..79dcc02277d2 100644
--- a/drivers/misc/mei/hdcp/mei_hdcp.c
+++ b/drivers/misc/mei/hdcp/mei_hdcp.c
@@ -732,8 +732,9 @@ static const struct i915_hdcp_component_ops mei_hdcp_ops = {
 	.close_hdcp_session = mei_hdcp_close_session,
 };
 
-static int mei_component_master_bind(struct device *dev)
+static int mei_component_master_bind(struct aggregate_device *adev)
 {
+	struct device *dev = adev->parent;
 	struct mei_cl_device *cldev = to_mei_cl_device(dev);
 	struct i915_hdcp_comp_master *comp_master =
 						mei_cldev_get_drvdata(cldev);
@@ -749,8 +750,9 @@ static int mei_component_master_bind(struct device *dev)
 	return 0;
 }
 
-static void mei_component_master_unbind(struct device *dev)
+static void mei_component_master_unbind(struct aggregate_device *adev)
 {
+	struct device *dev = adev->parent;
 	struct mei_cl_device *cldev = to_mei_cl_device(dev);
 	struct i915_hdcp_comp_master *comp_master =
 						mei_cldev_get_drvdata(cldev);
@@ -759,9 +761,13 @@ static void mei_component_master_unbind(struct device *dev)
 	component_unbind_all(dev, comp_master);
 }
 
-static const struct component_master_ops mei_component_master_ops = {
-	.bind = mei_component_master_bind,
-	.unbind = mei_component_master_unbind,
+static struct aggregate_driver mei_aggregate_driver = {
+	.probe = mei_component_master_bind,
+	.remove = mei_component_master_unbind,
+	.driver = {
+		.name = "mei_agg",
+		.owner = THIS_MODULE,
+	},
 };
 
 /**
@@ -826,9 +832,7 @@ static int mei_hdcp_probe(struct mei_cl_device *cldev,
 	}
 
 	mei_cldev_set_drvdata(cldev, comp_master);
-	ret = component_master_add_with_match(&cldev->dev,
-					      &mei_component_master_ops,
-					      master_match);
+	ret = component_aggregate_register(&cldev->dev, &mei_aggregate_driver, master_match);
 	if (ret < 0) {
 		dev_err(&cldev->dev, "Master comp add failed %d\n", ret);
 		goto err_exit;
@@ -850,7 +854,7 @@ static void mei_hdcp_remove(struct mei_cl_device *cldev)
 						mei_cldev_get_drvdata(cldev);
 	int ret;
 
-	component_master_del(&cldev->dev, &mei_component_master_ops);
+	component_aggregate_unregister(&cldev->dev, &mei_aggregate_driver);
 	kfree(comp_master);
 	mei_cldev_set_drvdata(cldev, NULL);
 
-- 
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: Saravana Kannan <saravanak@google.com>,
	Arnd Bergmann <arnd@arndb.de>,
	"Rafael J. Wysocki" <rafael@kernel.org>,
	linux-arm-msm@vger.kernel.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>,
	Tomas Winkler <tomas.winkler@intel.com>,
	freedreno@lists.freedesktop.org
Subject: [PATCH v4 27/34] mei: Migrate to aggregate driver
Date: Thu,  2 Dec 2021 14:27:25 -0800	[thread overview]
Message-ID: <20211202222732.2453851-28-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: Tomas Winkler <tomas.winkler@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.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/misc/mei/hdcp/mei_hdcp.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
index ec2a4fce8581..79dcc02277d2 100644
--- a/drivers/misc/mei/hdcp/mei_hdcp.c
+++ b/drivers/misc/mei/hdcp/mei_hdcp.c
@@ -732,8 +732,9 @@ static const struct i915_hdcp_component_ops mei_hdcp_ops = {
 	.close_hdcp_session = mei_hdcp_close_session,
 };
 
-static int mei_component_master_bind(struct device *dev)
+static int mei_component_master_bind(struct aggregate_device *adev)
 {
+	struct device *dev = adev->parent;
 	struct mei_cl_device *cldev = to_mei_cl_device(dev);
 	struct i915_hdcp_comp_master *comp_master =
 						mei_cldev_get_drvdata(cldev);
@@ -749,8 +750,9 @@ static int mei_component_master_bind(struct device *dev)
 	return 0;
 }
 
-static void mei_component_master_unbind(struct device *dev)
+static void mei_component_master_unbind(struct aggregate_device *adev)
 {
+	struct device *dev = adev->parent;
 	struct mei_cl_device *cldev = to_mei_cl_device(dev);
 	struct i915_hdcp_comp_master *comp_master =
 						mei_cldev_get_drvdata(cldev);
@@ -759,9 +761,13 @@ static void mei_component_master_unbind(struct device *dev)
 	component_unbind_all(dev, comp_master);
 }
 
-static const struct component_master_ops mei_component_master_ops = {
-	.bind = mei_component_master_bind,
-	.unbind = mei_component_master_unbind,
+static struct aggregate_driver mei_aggregate_driver = {
+	.probe = mei_component_master_bind,
+	.remove = mei_component_master_unbind,
+	.driver = {
+		.name = "mei_agg",
+		.owner = THIS_MODULE,
+	},
 };
 
 /**
@@ -826,9 +832,7 @@ static int mei_hdcp_probe(struct mei_cl_device *cldev,
 	}
 
 	mei_cldev_set_drvdata(cldev, comp_master);
-	ret = component_master_add_with_match(&cldev->dev,
-					      &mei_component_master_ops,
-					      master_match);
+	ret = component_aggregate_register(&cldev->dev, &mei_aggregate_driver, master_match);
 	if (ret < 0) {
 		dev_err(&cldev->dev, "Master comp add failed %d\n", ret);
 		goto err_exit;
@@ -850,7 +854,7 @@ static void mei_hdcp_remove(struct mei_cl_device *cldev)
 						mei_cldev_get_drvdata(cldev);
 	int ret;
 
-	component_master_del(&cldev->dev, &mei_component_master_ops);
+	component_aggregate_unregister(&cldev->dev, &mei_aggregate_driver);
 	kfree(comp_master);
 	mei_cldev_set_drvdata(cldev, NULL);
 
-- 
https://chromeos.dev


  parent reply	other threads:[~2021-12-02 22:28 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 ` [PATCH v4 26/34] iommu/mtk: " 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 27/34] mei: " 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-28-swboyd@chromium.org \
    --to=swboyd@chromium.org \
    --cc=arnd@arndb.de \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=gregkh@linuxfoundation.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=tomas.winkler@intel.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.