From: Herve Codina <herve.codina@bootlin.com>
To: Andrew Lunn <andrew@lunn.ch>, Rob Herring <robh@kernel.org>,
Saravana Kannan <saravanak@kernel.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Kalle Niemi <kaleposti@gmail.com>,
Matti Vaittinen <mazziesaccount@gmail.com>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Andreas Kemnade <andreas@kemnade.info>,
Kevin Hilman <khilman@baylibre.com>,
Roger Quadros <rogerq@kernel.org>,
Tony Lindgren <tony@atomide.com>,
Russell King <linux@armlinux.org.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Danilo Krummrich <dakr@kernel.org>,
Johan Hovold <johan@kernel.org>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
driver-core@lists.linux.dev, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Allan Nielsen <allan.nielsen@microchip.com>,
Horatiu Vultur <horatiu.vultur@microchip.com>,
Daniel Machon <daniel.machon@microchip.com>,
Steen Hegelund <steen.hegelund@microchip.com>,
Luca Ceresoli <luca.ceresoli@bootlin.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Herve Codina <herve.codina@bootlin.com>,
stable+noautosel@kernel.org
Subject: [PATCH v10 5/5] bus: simple-pm-bus: Populate child nodes at probe
Date: Thu, 19 Nov 2026 12:00:11 +0100 [thread overview]
Message-ID: <20261119110014.582363-6-herve.codina@bootlin.com> (raw)
In-Reply-To: <20261119110014.582363-1-herve.codina@bootlin.com>
The simple-pm-bus driver handles several simple busses. When it is used
with busses other than a compatible "simple-pm-bus", it doesn't populate
its child devices during its probe.
This confuses fw_devlink and results in wrong or missing devlinks.
Once a driver is bound to a device and the probe() has been called,
device_links_driver_bound() is called.
This function performs operation based on the following assumption:
If a child firmware node of the bound device is not added as a
device, it will never be added.
Among operations done on fw_devlinks of those "never be added" devices,
device_links_driver_bound() changes their supplier.
With devices attached to a simple-bus compatible device, this change
leads to wrong devlinks where supplier of devices points to the device
parent (i.e. simple-bus compatible device) instead of the device itself
(i.e. simple-bus child).
When the device attached to the simple-bus is removed, because devlinks
are not correct, its consumers are not removed first.
In order to have correct devlinks created, make the simple-pm-bus driver
compliant with the devlink assumption and create its child devices
during its probe.
Fixes: 628b8ca3e915 ("bus: simple-pm-bus: Remove child devices when the bus is unbound")
Cc: <stable+noautosel@kernel.org> # Need more devices described in LAN966x PCI dtso
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
---
drivers/bus/simple-pm-bus.c | 35 +++++++++++++++++++++++++----------
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/drivers/bus/simple-pm-bus.c b/drivers/bus/simple-pm-bus.c
index 23ac18551fd9..6afc992a750f 100644
--- a/drivers/bus/simple-pm-bus.c
+++ b/drivers/bus/simple-pm-bus.c
@@ -26,6 +26,12 @@ static void simple_pm_bus_depopulate(void *data)
{
struct device *dev = data;
+ if (!pm_runtime_enabled(dev)) {
+ /* No PM runtime, we can directly depopulate */
+ of_platform_depopulate(dev);
+ return;
+ }
+
/*
* Bus stays on for children
* This ensure that the bus will not be put in idle asynchronously when
@@ -46,7 +52,7 @@ static void simple_pm_bus_depopulate(void *data)
pm_runtime_put_sync(dev);
}
-static int simple_pm_bus_populate(struct device *dev,
+static int simple_pm_bus_populate(struct device *dev, bool default_populate,
const struct of_dev_auxdata *lookup)
{
struct device_node *np = dev->of_node;
@@ -55,7 +61,9 @@ static int simple_pm_bus_populate(struct device *dev,
if (!np)
return 0;
- ret = of_platform_populate(np, NULL, lookup, dev);
+ ret = default_populate ?
+ of_platform_default_populate(np, lookup, dev) :
+ of_platform_populate(np, NULL, lookup, dev);
if (ret)
return ret;
@@ -83,16 +91,23 @@ static int simple_pm_bus_probe(struct platform_device *pdev)
match = of_match_device(dev->driver->of_match_table, dev);
/*
* These are transparent bus devices (not simple-pm-bus matches) that
- * have their child nodes populated automatically. So, don't need to
- * do anything more. We only match with the device if this driver is
- * the most specific match because we don't want to incorrectly bind to
- * a device that has a more specific driver.
+ * need to have their child nodes populated. So, don't need to do
+ * anything more except populate child nodes during this probe(). We
+ * only match with the device if this driver is the most specific match
+ * because we don't want to incorrectly bind to a device that has a more
+ * specific driver.
*/
if (match && match->data) {
- if (of_property_match_string(np, "compatible", match->compatible) == 0)
- return 0;
- else
+ if (of_property_match_string(np, "compatible", match->compatible))
return -ENODEV;
+
+ dev_dbg(&pdev->dev, "%s: populate only\n", __func__);
+
+ ret = simple_pm_bus_populate(&pdev->dev, true, lookup);
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret, "failed to populate\n");
+
+ return 0;
}
bus = devm_kzalloc(&pdev->dev, sizeof(*bus), GFP_KERNEL);
@@ -111,7 +126,7 @@ static int simple_pm_bus_probe(struct platform_device *pdev)
if (ret)
return dev_err_probe(&pdev->dev, ret, "failed enable pm_runtime\n");
- ret = simple_pm_bus_populate(&pdev->dev, lookup);
+ ret = simple_pm_bus_populate(&pdev->dev, false, lookup);
if (ret)
return dev_err_probe(&pdev->dev, ret, "failed to populate\n");
--
2.56.0
next prev parent reply other threads:[~2026-11-19 11:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 11:00 [PATCH v10 0/5] lan966x pci device: Add support for SFPs, simple-bus part Herve Codina
2026-11-19 11:00 ` [PATCH v10 1/5] bus: simple-pm-bus: Avoid inconsistencies between probe() and remove() Herve Codina
2026-11-19 11:00 ` [PATCH v10 2/5] bus: simple-pm-bus: Remove the remove() function Herve Codina
2026-11-19 11:00 ` [PATCH v10 3/5] bus: simple-pm-bus: Remove child devices when the bus is unbound Herve Codina
2026-11-19 11:00 ` [PATCH v10 4/5] ARM: OMAP2+: pdata-quirks: Pass auxdata for simple-bus devices Herve Codina
2026-11-19 11:00 ` Herve Codina [this message]
2026-11-19 11:16 ` [PATCH v10 5/5] bus: simple-pm-bus: Populate child nodes at probe sashiko-bot
2026-11-19 11:25 ` [PATCH v10 0/5] lan966x pci device: Add support for SFPs, simple-bus part Herve Codina
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=20261119110014.582363-6-herve.codina@bootlin.com \
--to=herve.codina@bootlin.com \
--cc=aaro.koskinen@iki.fi \
--cc=allan.nielsen@microchip.com \
--cc=andreas@kemnade.info \
--cc=andrew@lunn.ch \
--cc=dakr@kernel.org \
--cc=daniel.machon@microchip.com \
--cc=devicetree@vger.kernel.org \
--cc=driver-core@lists.linux.dev \
--cc=geert+renesas@glider.be \
--cc=gregkh@linuxfoundation.org \
--cc=horatiu.vultur@microchip.com \
--cc=johan@kernel.org \
--cc=kaleposti@gmail.com \
--cc=khilman@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=luca.ceresoli@bootlin.com \
--cc=mazziesaccount@gmail.com \
--cc=rafael@kernel.org \
--cc=robh@kernel.org \
--cc=rogerq@kernel.org \
--cc=saravanak@kernel.org \
--cc=stable+noautosel@kernel.org \
--cc=steen.hegelund@microchip.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=tony@atomide.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.