# \[PATCH v4 00/34\] component: Make into an aggregate bus - Subsystems: FRAMEBUFFER LAYER, OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2), AB8500 BATTERY AND CHARGER DRIVERS, ARM HDLCD DRM DRIVER, ARM KOMEDA DRM-KMS DRIVER, ARM MALI-DP DRM DRIVER, ARM/Rockchip SoC support, CHAR and MISC DRIVERS, DRIVER COMPONENT FRAMEWORK, DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS, DRM DRIVER FOR ST-ERICSSON MCDE, DRM DRIVER for Qualcomm display hardware, DRM DRIVERS, DRM DRIVERS AND MISC GPU PATCHES, DRM DRIVERS FOR ALLWINNER A10, DRM DRIVERS FOR AMLOGIC SOCS, DRM DRIVERS FOR EXYNOS, DRM DRIVERS FOR MEDIATEK, DRM DRIVERS FOR ROCKCHIP, DRM DRIVERS FOR TI LCDC, DRM DRIVERS FOR TI OMAP, DRM DRIVERS FOR VC4, DRM DRIVERS FOR VIVANTE GPU IP, INGENIC JZ47xx SoCs, INTEL MANAGEMENT ENGINE (mei), IOMMU SUBSYSTEM, MARVELL ARMADA DRM SUPPORT, MEDIATEK IOMMU DRIVER, POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS, QCOM AUDIO (ASoC) DRIVERS, SOUND, SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC), THE REST - Maintainers: Helge Deller, Linus Walleij, Liviu Dudau, Heiko Stuebner, Arnd Bergmann, Greg Kroah-Hartman, "Rafael J. Wysocki", Danilo Krummrich, Johan Hovold, Rob Clark, Dmitry Baryshkov, David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Chen-Yu Tsai, Neil Armstrong, Inki Dae, Seung-Woo Kim, Kyungmin Park, Chun-Kuang Hu, Philipp Zabel, Sandy Huang, Andy Yan, Jyri Sarha, Tomi Valkeinen, Dave Stevenson, Lucas Stach, Paul Cercueil, Alexander Usyskin, Joerg Roedel, Will Deacon, Russell King, Yong Wu, Sebastian Reichel, Srinivas Kandagatla, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown, Linus Torvalds - Series: 34 patches touching 33 files, +1,066/-784 - Status: SUPERSEDED (Superseded by v6 posted 2022-01-27) - Superseded by v6 (posted 2022-01-27). - Revision v4 (6 revisions archived). - List: linux-fbdev - 5 messages, 3 authors - Page: https://ratatoskr.run/linux-fbdev/2021/12/1594741/t ## \[PATCH v4 00/34\] component: Make into an aggregate bus - From: Stephen Boyd \ - Date: 2021-12-02 22:27:39 - Message: https://ratatoskr.run/linux-fbdev/2021/12/1594741.md ```text 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. 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 (34): component: Introduce struct aggregate_device component: Remove most references to 'master' component: Introduce the aggregate bus_type component: Move struct aggregate_device out to header file 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/mtk: 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 mei: pxp: Migrate to aggregate driver component: Get rid of drm_of_component_probe() component: Remove component_master_ops and friends drivers/base/component.c | 544 ++++++++++-------- .../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 | 46 +- drivers/gpu/drm/omapdrm/dss/dss.c | 20 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 20 +- 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/misc/mei/hdcp/mei_hdcp.c | 22 +- drivers/misc/mei/pxp/mei_pxp.c | 22 +- drivers/power/supply/ab8500_charger.c | 22 +- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 20 +- include/drm/drm_of.h | 10 +- include/linux/component.h | 92 ++- sound/hda/hdac_component.c | 21 +- sound/soc/codecs/wcd938x.c | 20 +- 33 files changed, 772 insertions(+), 490 deletions(-) Cc: Arnd Bergmann Cc: Benjamin Gaignard Cc: Chen Feng Cc: Chen-Yu Tsai Cc: Christian Gmeiner Cc: Chun-Kuang Hu Cc: Daniel Vetter Cc: Emma Anholt Cc: Greg Kroah-Hartman Cc: "Heiko Stübner" Cc: Inki Dae Cc: James Qian Wang (Arm Technology China) Cc: Jaroslav Kysela Cc: Joerg Roedel Cc: John Stultz Cc: Joonyoung Shim Cc: Jyri Sarha Cc: Kai Vehmanen Cc: Kyungmin Park Cc: Laurent Pinchart Cc: Cc: Cc: Cc: Linus Walleij Cc: Liviu Dudau Cc: Lucas Stach Cc: Mark Brown Cc: Maxime Ripard Cc: Neil Armstrong Cc: Paul Cercueil Cc: Philipp Zabel Cc: "Rafael J. Wysocki" Cc: Rob Clark Cc: Russell King Cc: Russell King Cc: Russell King Cc: Sandy Huang Cc: Saravana Kannan Cc: Sebastian Reichel Cc: Seung-Woo Kim Cc: Takashi Iwai Cc: Tian Tao Cc: Tomas Winkler Cc: Tomi Valkeinen Cc: Will Deacon Cc: Xinliang Liu Cc: Xinwei Kong Cc: Yong Wu Cc: Vitaly Lubart Cc: Daniele Ceraolo Spurio Cc: Rodrigo Vivi Cc: Kai Vehmanen base-commit: 136057256686de39cc3a07c2e39ef6bc43003ff6 -- https://chromeos.dev ``` ## \[PATCH v4 29/34\] fbdev: omap2: Migrate to aggregate driver - From: Stephen Boyd \ - Date: 2021-12-02 22:29:31 - Message: https://ratatoskr.run/linux-fbdev/2021/12/1594774.md ```text 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: Cc: Cc: Daniel Vetter Cc: "Rafael J. Wysocki" Cc: Rob Clark Cc: Russell King Cc: Saravana Kannan Signed-off-by: Stephen Boyd --- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c index a6b1c1598040..f12663c39ceb 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c @@ -1067,8 +1067,9 @@ static int dss_video_pll_probe(struct platform_device *pdev) } /* DSS HW IP initialisation */ -static int dss_bind(struct device *dev) +static int dss_bind(struct aggregate_device *adev) { + struct device *dev = adev->parent; struct platform_device *pdev = to_platform_device(dev); struct resource *dss_mem; u32 rev; @@ -1167,8 +1168,9 @@ static int dss_bind(struct device *dev) return r; } -static void dss_unbind(struct device *dev) +static void dss_unbind(struct aggregate_device *adev) { + struct device *dev = adev->parent; struct platform_device *pdev = to_platform_device(dev); dss_initialized = false; @@ -1188,9 +1190,13 @@ static void dss_unbind(struct device *dev) dss_put_clocks(); } -static const struct component_master_ops dss_component_ops = { - .bind = dss_bind, - .unbind = dss_unbind, +static struct aggregate_driver dss_aggregate_driver = { + .probe = dss_bind, + .remove = dss_unbind, + .driver = { + .name = "dss_fbdev", + .owner = THIS_MODULE, + }, }; static int dss_component_compare(struct device *dev, void *data) @@ -1225,7 +1231,7 @@ static int dss_probe(struct platform_device *pdev) /* add all the child devices as components */ device_for_each_child(&pdev->dev, &match, dss_add_child_component); - r = component_master_add_with_match(&pdev->dev, &dss_component_ops, match); + r = component_aggregate_register(&pdev->dev, &dss_aggregate_driver, match); if (r) return r; @@ -1234,7 +1240,7 @@ static int dss_probe(struct platform_device *pdev) static int dss_remove(struct platform_device *pdev) { - component_master_del(&pdev->dev, &dss_component_ops); + component_aggregate_unregister(&pdev->dev, &dss_aggregate_driver); return 0; } -- https://chromeos.dev ``` ## Re: \[PATCH v4 00/34\] component: Make into an aggregate bus - From: Linus Walleij \ - Date: 2021-12-03 01:51:54 - Message: https://ratatoskr.run/linux-fbdev/2021/12/1594928.md ```text On Thu, Dec 2, 2021 at 11:27 PM Stephen Boyd [ref] wrote: > drm/mcde: Migrate to aggregate driver This also works fine after the patch series. Tested-by: Linus Walleij Yours, Linus Walleij ``` ## Re: \[PATCH v4 00/34\] component: Make into an aggregate bus - From: Daniel Vetter \ - Date: 2021-12-07 18:22:23 - Message: https://ratatoskr.run/linux-fbdev/2021/12/1600099.md ```text On Thu, Dec 02, 2021 at 02:26:58PM -0800, Stephen Boyd wrote: > 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. Thanks for pushing this forward. Unfortunately I'm completely burried and it's just not improving, so merge plan: - please get Greg KH to ack the bus/driver core stuff - please get one of the drm-misc committers we have from Google's Chromeos team (there should be a few by now) to review&push this. Otherwise I fear this might get stuck and I'd really like to avoid that. Cheers, Daniel > > 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 (34): > component: Introduce struct aggregate_device > component: Remove most references to 'master' > component: Introduce the aggregate bus_type > component: Move struct aggregate_device out to header file > 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/mtk: 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 > mei: pxp: Migrate to aggregate driver > component: Get rid of drm_of_component_probe() > component: Remove component_master_ops and friends > > drivers/base/component.c | 544 ++++++++++-------- > .../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 | 46 +- > drivers/gpu/drm/omapdrm/dss/dss.c | 20 +- > drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 20 +- > 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/misc/mei/hdcp/mei_hdcp.c | 22 +- > drivers/misc/mei/pxp/mei_pxp.c | 22 +- > drivers/power/supply/ab8500_charger.c | 22 +- > drivers/video/fbdev/omap2/omapfb/dss/dss.c | 20 +- > include/drm/drm_of.h | 10 +- > include/linux/component.h | 92 ++- > sound/hda/hdac_component.c | 21 +- > sound/soc/codecs/wcd938x.c | 20 +- > 33 files changed, 772 insertions(+), 490 deletions(-) > > Cc: Arnd Bergmann > Cc: Benjamin Gaignard > Cc: Chen Feng > Cc: Chen-Yu Tsai > Cc: Christian Gmeiner > Cc: Chun-Kuang Hu > Cc: Daniel Vetter > Cc: Emma Anholt > Cc: Greg Kroah-Hartman > Cc: "Heiko Stübner" > Cc: Inki Dae > Cc: James Qian Wang (Arm Technology China) > Cc: Jaroslav Kysela > Cc: Joerg Roedel > Cc: John Stultz > Cc: Joonyoung Shim > Cc: Jyri Sarha > Cc: Kai Vehmanen > Cc: Kyungmin Park > Cc: Laurent Pinchart > Cc: > Cc: > Cc: > Cc: Linus Walleij > Cc: Liviu Dudau > Cc: Lucas Stach > Cc: Mark Brown > Cc: Maxime Ripard > Cc: Neil Armstrong > Cc: Paul Cercueil > Cc: Philipp Zabel > Cc: "Rafael J. Wysocki" > Cc: Rob Clark > Cc: Russell King > Cc: Russell King > Cc: Russell King > Cc: Sandy Huang > Cc: Saravana Kannan > Cc: Sebastian Reichel > Cc: Seung-Woo Kim > Cc: Takashi Iwai > Cc: Tian Tao > Cc: Tomas Winkler > Cc: Tomi Valkeinen > Cc: Will Deacon > Cc: Xinliang Liu > Cc: Xinwei Kong > Cc: Yong Wu > Cc: Vitaly Lubart > Cc: Daniele Ceraolo Spurio > Cc: Rodrigo Vivi > Cc: Kai Vehmanen > > base-commit: 136057256686de39cc3a07c2e39ef6bc43003ff6 > -- > https://chromeos.dev > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ``` ## Re: \[PATCH v4 00/34\] component: Make into an aggregate bus - From: Stephen Boyd \ - Date: 2021-12-13 21:43:26 - Message: https://ratatoskr.run/linux-fbdev/2021/12/1607274.md ```text Quoting Daniel Vetter (2021-12-07 10:22:15) > On Thu, Dec 02, 2021 at 02:26:58PM -0800, Stephen Boyd wrote: > > 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. > > Thanks for pushing this forward. Unfortunately I'm completely burried and > it's just not improving, so merge plan: > > - please get Greg KH to ack the bus/driver core stuff > > - please get one of the drm-misc committers we have from Google's Chromeos > team (there should be a few by now) to review&push this. Sounds like a plan. Thanks! > > Otherwise I fear this might get stuck and I'd really like to avoid that. > ```