| Message ID | 20220127200141.1295328-1-swboyd@chromium.org |
|---|---|
| Headers | show |
| Series | component: Make into an aggregate bus | expand |
> -----Original Message----- > From: Stephen Boyd <swboyd@chromium.org> > Sent: 27 January 2022 20:02 > 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; Stefan > Binding <sbinding@opensource.cirrus.com>; Lucas Tanure > <tanureal@opensource.cirrus.com>; Takashi Iwai <tiwai@suse.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 v6 33/35] ALSA: hda/realtek: Migrate to aggregate driver > > 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: Stefan Binding <sbinding@opensource.cirrus.com> > Cc: Lucas Tanure <tanureal@opensource.cirrus.com> > Cc: Takashi Iwai <tiwai@suse.de> > 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> > --- > sound/pci/hda/patch_realtek.c | 20 +++++++++++++------- > 1 file changed, 13 insertions(+), 7 deletions(-) > > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c > index 668274e52674..80a2164c99b6 100644 > --- a/sound/pci/hda/patch_realtek.c > +++ b/sound/pci/hda/patch_realtek.c > @@ -6547,25 +6547,31 @@ static int find_comp_by_dev_name(struct > alc_spec *spec, const char *name) > return -ENODEV; > } > > -static int comp_bind(struct device *dev) > +static int realtek_aggregate_probe(struct aggregate_device *adev) > { > + struct device *dev = aggregate_device_parent(adev); > struct hda_codec *cdc = dev_to_hda_codec(dev); > struct alc_spec *spec = cdc->spec; > > return component_bind_all(dev, spec->comps); > } > > -static void comp_unbind(struct device *dev) > +static void realtek_aggregate_remove(struct aggregate_device *adev) > { > + struct device *dev = aggregate_device_parent(adev); > struct hda_codec *cdc = dev_to_hda_codec(dev); > struct alc_spec *spec = cdc->spec; > > component_unbind_all(dev, spec->comps); > } > > -static const struct component_master_ops comp_master_ops = { > - .bind = comp_bind, > - .unbind = comp_unbind, > +static struct aggregate_driver realtek_aggregate_driver = { > + .probe = realtek_aggregate_probe, > + .remove = realtek_aggregate_remove, > + .driver = { > + .name = "realtek_aggregate", > + .owner = THIS_MODULE, > + }, > }; > > static void comp_generic_playback_hook(struct hda_pcm_stream *hinfo, > struct hda_codec *cdc, > @@ -6597,7 +6603,7 @@ static void cs35l41_generic_fixup(struct hda_codec > *cdc, int action, const char > return; > component_match_add(dev, &spec->match, > comp_match_dev_name, name); > } > - ret = component_master_add_with_match(dev, > &comp_master_ops, spec->match); > + ret = component_aggregate_register(dev, > &realtek_aggregate_driver, spec->match); > if (ret) > codec_err(cdc, "Fail to register component > aggregator %d\n", ret); > else > @@ -6648,7 +6654,7 @@ static void > alc287_fixup_legion_16achg6_speakers(struct hda_codec *cdc, const st > "i2c-CLSA0100:00-cs35l41-hda.0"); > component_match_add(dev, &spec->match, > comp_match_dev_name, > "i2c-CLSA0100:00-cs35l41-hda.1"); > - ret = component_master_add_with_match(dev, > &comp_master_ops, spec->match); > + ret = component_aggregate_register(dev, > &realtek_aggregate_driver, spec->match); > if (ret) > codec_err(cdc, "Fail to register component > aggregator %d\n", ret); > else > -- > https://chromeos.dev Tested locally, and no issues found. Tested-by: Stefan Binding <sbinding@opensource.cirrus.com> Thanks, Stefan
This series is from discussion we had on reordering the device lists for drm shutdown paths[1]. I've introduced an 'aggregate' bus that we put the aggregate device onto and then we probe the aggregate device once all the components are probed and call component_add(). The probe/remove hooks are where the bind/unbind calls go, and then a shutdown hook is added that can be used to shutdown the drm display pipeline at the right time. This works for me on my sc7180 board. I no longer get a warning from i2c at shutdown that we're trying to make an i2c transaction after the i2c bus has been shutdown. There's more work to do on the msm drm driver to extract component device resources like clks, regulators, etc. out of the component bind function into the driver probe but I wanted to move everything over now in other component drivers before tackling that problem. Tested-by tags would be appreciated, and Acked-by/Reviewed-by tags too. Per Daniel, I've resent this to collect Acks or Review tags from gregkh and once Greg is happy with the driver core bits it can be merged through drm-misc tree via dianders (both are on the To line). Changes since v5 (https://lore.kernel.org/r/20220106214556.2461363-1-swboyd@chromium.org): - Refcount the driver registration to support multiple device usage - Fix runtime PM in MediaTek iommu patch - Rebased to v5.17-rc1 and converted new component uses - No longer expose struct aggregate_device in component.h header Changes since v4 (https://lore.kernel.org/r/20211202222732.2453851-1-swboyd@chromium.org): - Picked up tags - Moved rename patch to first in the series - Squashed device and bus type patch together Changes since v3 (https://lore.kernel.org/r/20211026000044.885195-1-swboyd@chromium.org): - Picked up tags - Rebased to v5.16-rc2 - Updated component.c for a few new patches there - Dropped a conversion patch - Added a conversion patch Changes since v2 (https://lore.kernel.org/r/20211006193819.2654854-1-swboyd@chromium.org): - Picked up acks - Fixed build warnings/errors - Reworked patch series to rename 'master' in a different patch Changes since v1 (https://lore.kernel.org/r/20210520002519.3538432-1-swboyd@chromium.org): - Use devlink to connect components to the aggregate device - Don't set the registering device as a parent of the aggregate device - New patch for bind_component/unbind_component ops that takes the aggregate device - Convert all drivers in the tree to use the aggregate driver approach - Allow one aggregate driver to be used for multiple aggregate devices [1] https://lore.kernel.org/r/20210508074118.1621729-1-swboyd@chromium.org Stephen Boyd (35): component: Replace most references to 'master' with 'aggregate device' component: Introduce the aggregate bus_type component: Add aggregate_device_parent() for driver use component: Add {bind,unbind}_component() ops that take aggregate device drm/of: Add a drm_of_aggregate_probe() API drm/msm: Migrate to aggregate driver drm/komeda: Migrate to aggregate driver drm/arm/hdlcd: Migrate to aggregate driver drm/malidp: Migrate to aggregate driver drm/armada: Migrate to aggregate driver drm/etnaviv: Migrate to aggregate driver drm/kirin: Migrate to aggregate driver drm/exynos: Migrate to aggregate driver drm/imx: Migrate to aggregate driver drm/ingenic: Migrate to aggregate driver drm/mcde: Migrate to aggregate driver drm/mediatek: Migrate to aggregate driver drm/meson: Migrate to aggregate driver drm/omap: Migrate to aggregate driver drm/rockchip: Migrate to aggregate driver drm/sti: Migrate to aggregate driver drm/sun4i: Migrate to aggregate driver drm/tilcdc: Migrate to aggregate driver drm/vc4: Migrate to aggregate driver iommu/mediatek: Migrate to aggregate driver mei: Migrate to aggregate driver power: supply: ab8500: Migrate to aggregate driver fbdev: omap2: Migrate to aggregate driver sound: hdac: Migrate to aggregate driver ASoC: codecs: wcd938x: Migrate to aggregate driver drm/sprd: Migrate to aggregate driver usb: typec: port-mapper: Migrate to aggregate driver ALSA: hda/realtek: Migrate to aggregate driver component: Get rid of drm_of_component_probe() component: Remove component_master_ops and friends drivers/base/component.c | 571 +++++++++++------- .../gpu/drm/arm/display/komeda/komeda_drv.c | 20 +- drivers/gpu/drm/arm/hdlcd_drv.c | 21 +- drivers/gpu/drm/arm/malidp_drv.c | 21 +- drivers/gpu/drm/armada/armada_drv.c | 23 +- drivers/gpu/drm/drm_drv.c | 2 +- drivers/gpu/drm/drm_of.c | 18 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 20 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 21 +- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 20 +- drivers/gpu/drm/imx/imx-drm-core.c | 20 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 25 +- drivers/gpu/drm/mcde/mcde_drv.c | 23 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 20 +- drivers/gpu/drm/meson/meson_drv.c | 21 +- drivers/gpu/drm/msm/msm_drv.c | 48 +- drivers/gpu/drm/omapdrm/dss/dss.c | 20 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 20 +- drivers/gpu/drm/sprd/sprd_drm.c | 48 +- drivers/gpu/drm/sti/sti_drv.c | 20 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 26 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 28 +- drivers/gpu/drm/vc4/vc4_drv.c | 20 +- drivers/iommu/mtk_iommu.c | 14 +- drivers/iommu/mtk_iommu.h | 6 +- drivers/iommu/mtk_iommu_v1.c | 14 +- drivers/memory/mtk-smi.c | 10 +- drivers/misc/mei/hdcp/mei_hdcp.c | 22 +- drivers/misc/mei/pxp/mei_pxp.c | 22 +- drivers/power/supply/ab8500_charger.c | 22 +- drivers/usb/typec/port-mapper.c | 22 +- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 20 +- include/drm/drm_of.h | 10 +- include/linux/component.h | 96 ++- sound/hda/hdac_component.c | 21 +- sound/pci/hda/patch_realtek.c | 20 +- sound/soc/codecs/wcd938x.c | 20 +- 37 files changed, 863 insertions(+), 532 deletions(-) Cc: Arnd Bergmann <arnd@arndb.de> Cc: Baolin Wang <baolin.wang7@gmail.com> Cc: Chen Feng <puck.chen@hisilicon.com> Cc: Chen-Yu Tsai <wens@csie.org> Cc: Christian Gmeiner <christian.gmeiner@gmail.com> Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org> Cc: Chunyan Zhang <zhang.lyra@gmail.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Emma Anholt <emma@anholt.net> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com> Cc: "Heiko Stübner" <heiko@sntech.de> Cc: Inki Dae <inki.dae@samsung.com> Cc: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Joerg Roedel <joro@8bytes.org> Cc: John Stultz <john.stultz@linaro.org> Cc: Joonyoung Shim <jy0922.shim@samsung.com> Cc: Jyri Sarha <jyri.sarha@iki.fi> Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com> Cc: Kevin Tang <kevin3.tang@gmail.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: <linux-fbdev@vger.kernel.org> Cc: <linux-omap@vger.kernel.org> Cc: <linux-pm@vger.kernel.org> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Liviu Dudau <liviu.dudau@arm.com> Cc: Lucas Stach <l.stach@pengutronix.de> Cc: Lucas Tanure <tanureal@opensource.cirrus.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Mark Brown <broonie@kernel.org> Cc: Maxime Ripard <mripard@kernel.org> Cc: Neil Armstrong <narmstrong@baylibre.com> Cc: Orson Zhai <orsonzhai@gmail.com> Cc: Paul Cercueil <paul@crapouillou.net> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: "Rafael J. Wysocki" <rafael@kernel.org> Cc: Rob Clark <robdclark@gmail.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Russell King <linux+etnaviv@armlinux.org.uk> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Sandy Huang <hjc@rock-chips.com> Cc: Saravana Kannan <saravanak@google.com> Cc: Sebastian Reichel <sre@kernel.org> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Cc: Stefan Binding <sbinding@opensource.cirrus.com> Cc: Takashi Iwai <tiwai@suse.com> Cc: Tian Tao <tiantao6@hisilicon.com> Cc: Tomas Winkler <tomas.winkler@intel.com> Cc: Tomi Valkeinen <tomba@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: Xinliang Liu <xinliang.liu@linaro.org> Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com> Cc: Yong Wu <yong.wu@mediatek.com> Cc: Vitaly Lubart <vitaly.lubart@intel.com> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com> base-commit: e783362eb54cd99b2cac8b3a9aeac942e6f6ac07