* [PATCH v3 1/3] pmdomain: rockchip: remove subdomain links before the domains on error
2026-11-13 8:42 [PATCH v3 0/3] pmdomain: rockchip: fix the probe error and deferral paths Arun Iyengar via B4 Relay
@ 2026-11-13 8:42 ` Arun Iyengar via B4 Relay
2026-11-13 8:42 ` [PATCH v3 2/3] pmdomain: rockchip: don't report probe deferral as an error Arun Iyengar via B4 Relay
2026-11-13 8:42 ` [PATCH v3 3/3] pmdomain: rockchip: use dev_err_probe() for the other probe errors Arun Iyengar via B4 Relay
2 siblings, 0 replies; 4+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-13 8:42 UTC (permalink / raw)
To: Ulf Hansson, Heiko Stuebner, Shawn Lin, Sebastian Reichel,
Kevin Hilman, Caesar Wang, Elaine Zhang
Cc: linux-pm, linux-arm-kernel, linux-rockchip, linux-kernel, Yao Zi,
Igor Pecovnik, Arun Iyengar, stable
From: Arun Iyengar <aiyengar1990@gmail.com>
When probe fails after some domains were registered, the cleanup calls
pm_genpd_remove() in domain id order. That fails with -EBUSY for every
domain that is still a parent. Reversing the order does not help: on
RK3588 RKVDEC0/1 have a parent with a lower and one with a higher id.
devm then frees those domains while they are still on gpd_list.
Remove the parent/child links first, depth first over the DT nodes.
Fixes: 79d12b7a7f22 ("soc: rockchip: power-domain: use pm_genpd_remove in error cleanup")
Cc: stable@vger.kernel.org
Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
---
drivers/pmdomain/rockchip/pm-domains.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c
index 86b5074b0469..df3f43d0c01b 100644
--- a/drivers/pmdomain/rockchip/pm-domains.c
+++ b/drivers/pmdomain/rockchip/pm-domains.c
@@ -955,12 +955,45 @@ static void rockchip_pm_remove_one_domain(struct rockchip_pm_domain *pd)
/* devm will free our memory */
}
+static struct generic_pm_domain *
+rockchip_pm_node_to_genpd(struct rockchip_pmu *pmu, struct device_node *node)
+{
+ u32 id;
+
+ if (of_property_read_u32(node, "reg", &id) ||
+ id >= pmu->genpd_data.num_domains)
+ return NULL;
+
+ return pmu->genpd_data.domains[id];
+}
+
+/* Remove the links depth first, so each child has no subdomains left. */
+static void rockchip_pm_remove_subdomains(struct rockchip_pmu *pmu,
+ struct device_node *parent)
+{
+ struct generic_pm_domain *parent_domain, *child_domain;
+
+ parent_domain = rockchip_pm_node_to_genpd(pmu, parent);
+
+ for_each_child_of_node_scoped(parent, np) {
+ rockchip_pm_remove_subdomains(pmu, np);
+
+ child_domain = rockchip_pm_node_to_genpd(pmu, np);
+ if (parent_domain && child_domain)
+ pm_genpd_remove_subdomain(parent_domain, child_domain);
+ }
+}
+
static void rockchip_pm_domain_cleanup(struct rockchip_pmu *pmu)
{
struct generic_pm_domain *genpd;
struct rockchip_pm_domain *pd;
int i;
+ /* pm_genpd_remove() refuses a domain that still has subdomains */
+ for_each_available_child_of_node_scoped(pmu->dev->of_node, np)
+ rockchip_pm_remove_subdomains(pmu, np);
+
for (i = 0; i < pmu->genpd_data.num_domains; i++) {
genpd = pmu->genpd_data.domains[i];
if (genpd) {
--
2.55.0
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v3 2/3] pmdomain: rockchip: don't report probe deferral as an error
2026-11-13 8:42 [PATCH v3 0/3] pmdomain: rockchip: fix the probe error and deferral paths Arun Iyengar via B4 Relay
2026-11-13 8:42 ` [PATCH v3 1/3] pmdomain: rockchip: remove subdomain links before the domains on error Arun Iyengar via B4 Relay
@ 2026-11-13 8:42 ` Arun Iyengar via B4 Relay
2026-11-13 8:42 ` [PATCH v3 3/3] pmdomain: rockchip: use dev_err_probe() for the other probe errors Arun Iyengar via B4 Relay
2 siblings, 0 replies; 4+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-13 8:42 UTC (permalink / raw)
To: Ulf Hansson, Heiko Stuebner, Shawn Lin, Sebastian Reichel,
Kevin Hilman, Caesar Wang, Elaine Zhang
Cc: linux-pm, linux-arm-kernel, linux-rockchip, linux-kernel, Yao Zi,
Igor Pecovnik, Arun Iyengar, stable
From: Arun Iyengar <aiyengar1990@gmail.com>
A domain clock that is not available yet is printed as an error by
rockchip_pm_add_one_domain() and again by its callers, on every probe
attempt. A pm_qos syscon that defers turns into -ENODEV and fails the
probe.
Use dev_err_probe() where the errors happen, keep the syscon error code,
and drop the callers' messages.
Yao Zi sent a patch for the clock message earlier [1] and agreed to drop
it for this one.
Link: https://lore.kernel.org/r/20261105001257.1368266-3-me@ziyao.cc [1]
Fixes: 7c696693a4f5 ("soc: rockchip: power-domain: Add power domain driver")
Fixes: 6be05b5ec161 ("soc: rockchip: power-domain: add support for sub-power domains")
Fixes: 074c6a422d86 ("soc: rockchip: power-domain: support qos save and restore")
Suggested-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Cc: stable@vger.kernel.org
Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
---
drivers/pmdomain/rockchip/pm-domains.c | 37 +++++++++++++++++-----------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c
index df3f43d0c01b..a0b47d8c4b2a 100644
--- a/drivers/pmdomain/rockchip/pm-domains.c
+++ b/drivers/pmdomain/rockchip/pm-domains.c
@@ -849,17 +849,20 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
for (i = 0; i < pd->num_clks; i++) {
pd->clks[i].clk = of_clk_get(node, i);
if (IS_ERR(pd->clks[i].clk)) {
- error = PTR_ERR(pd->clks[i].clk);
- dev_err(pmu->dev,
- "%pOFn: failed to get clk at index %d: %d\n",
- node, i, error);
+ error = dev_err_probe(pmu->dev,
+ PTR_ERR(pd->clks[i].clk),
+ "%pOFn: failed to get clk at index %d\n",
+ node, i);
goto err_put_clocks;
}
}
error = clk_bulk_prepare(pd->num_clks, pd->clks);
- if (error)
+ if (error) {
+ dev_err_probe(pmu->dev, error,
+ "%pOFn: failed to prepare clocks\n", node);
goto err_put_clocks;
+ }
pd->num_qos = of_count_phandle_with_args(node, "pm_qos",
NULL);
@@ -884,13 +887,18 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
for (j = 0; j < pd->num_qos; j++) {
qos_node = of_parse_phandle(node, "pm_qos", j);
if (!qos_node) {
- error = -ENODEV;
+ error = dev_err_probe(pmu->dev, -ENODEV,
+ "%pOFn: failed to get pm_qos %d\n",
+ node, j);
goto err_unprepare_clocks;
}
pd->qos_regmap[j] = syscon_node_to_regmap(qos_node);
of_node_put(qos_node);
if (IS_ERR(pd->qos_regmap[j])) {
- error = -ENODEV;
+ error = dev_err_probe(pmu->dev,
+ PTR_ERR(pd->qos_regmap[j]),
+ "%pOFn: failed to get pm_qos %d regmap\n",
+ node, j);
goto err_unprepare_clocks;
}
}
@@ -1034,11 +1042,8 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu,
parent_domain = pmu->genpd_data.domains[idx];
error = rockchip_pm_add_one_domain(pmu, np);
- if (error) {
- dev_err(pmu->dev, "failed to handle node %pOFn: %d\n",
- np, error);
+ if (error)
return error;
- }
error = of_property_read_u32(np, "reg", &idx);
if (error) {
@@ -1128,18 +1133,12 @@ static int rockchip_pm_domain_probe(struct platform_device *pdev)
for_each_available_child_of_node_scoped(np, node) {
error = rockchip_pm_add_one_domain(pmu, node);
- if (error) {
- dev_err(dev, "failed to handle node %pOFn: %d\n",
- node, error);
+ if (error)
goto err_out;
- }
error = rockchip_pm_add_subdomain(pmu, node);
- if (error < 0) {
- dev_err(dev, "failed to handle subdomain node %pOFn: %d\n",
- node, error);
+ if (error < 0)
goto err_out;
- }
}
if (error) {
--
2.55.0
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v3 3/3] pmdomain: rockchip: use dev_err_probe() for the other probe errors
2026-11-13 8:42 [PATCH v3 0/3] pmdomain: rockchip: fix the probe error and deferral paths Arun Iyengar via B4 Relay
2026-11-13 8:42 ` [PATCH v3 1/3] pmdomain: rockchip: remove subdomain links before the domains on error Arun Iyengar via B4 Relay
2026-11-13 8:42 ` [PATCH v3 2/3] pmdomain: rockchip: don't report probe deferral as an error Arun Iyengar via B4 Relay
@ 2026-11-13 8:42 ` Arun Iyengar via B4 Relay
2 siblings, 0 replies; 4+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-13 8:42 UTC (permalink / raw)
To: Ulf Hansson, Heiko Stuebner, Shawn Lin, Sebastian Reichel,
Kevin Hilman, Caesar Wang, Elaine Zhang
Cc: linux-pm, linux-arm-kernel, linux-rockchip, linux-kernel, Yao Zi,
Igor Pecovnik, Arun Iyengar
From: Arun Iyengar <aiyengar1990@gmail.com>
Convert the remaining dev_err() and return pairs in the probe path to
dev_err_probe(). The return values do not change.
Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
---
drivers/pmdomain/rockchip/pm-domains.c | 63 ++++++++++++++--------------------
1 file changed, 26 insertions(+), 37 deletions(-)
diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c
index a0b47d8c4b2a..d132fdd11a56 100644
--- a/drivers/pmdomain/rockchip/pm-domains.c
+++ b/drivers/pmdomain/rockchip/pm-domains.c
@@ -804,28 +804,22 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
int error;
error = of_property_read_u32(node, "reg", &id);
- if (error) {
- dev_err(pmu->dev,
- "%pOFn: failed to retrieve domain id (reg): %d\n",
- node, error);
- return -EINVAL;
- }
-
- if (id >= pmu->info->num_domains) {
- dev_err(pmu->dev, "%pOFn: invalid domain id %d\n",
- node, id);
- return -EINVAL;
- }
+ if (error)
+ return dev_err_probe(pmu->dev, -EINVAL,
+ "%pOFn: failed to retrieve domain id (reg)\n",
+ node);
+
+ if (id >= pmu->info->num_domains)
+ return dev_err_probe(pmu->dev, -EINVAL,
+ "%pOFn: invalid domain id %d\n", node, id);
/* RK3588 has domains with two parents (RKVDEC0/RKVDEC1) */
if (pmu->genpd_data.domains[id])
return 0;
pd_info = &pmu->info->domain_info[id];
- if (!pd_info->pwr_mask && !pd_info->req_mask) {
- dev_err(pmu->dev, "%pOFn: undefined domain id %d\n",
- node, id);
- return -EINVAL;
- }
+ if (!pd_info->pwr_mask && !pd_info->req_mask)
+ return dev_err_probe(pmu->dev, -EINVAL,
+ "%pOFn: undefined domain id %d\n", node, id);
pd = devm_kzalloc_obj(pmu->dev, *pd);
if (!pd)
@@ -1033,12 +1027,10 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu,
u32 idx;
error = of_property_read_u32(parent, "reg", &idx);
- if (error) {
- dev_err(pmu->dev,
- "%pOFn: failed to retrieve domain id (reg): %d\n",
- parent, error);
- return error;
- }
+ if (error)
+ return dev_err_probe(pmu->dev, error,
+ "%pOFn: failed to retrieve domain id (reg)\n",
+ parent);
parent_domain = pmu->genpd_data.domains[idx];
error = rockchip_pm_add_one_domain(pmu, np);
@@ -1046,23 +1038,20 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu,
return error;
error = of_property_read_u32(np, "reg", &idx);
- if (error) {
- dev_err(pmu->dev,
- "%pOFn: failed to retrieve domain id (reg): %d\n",
- np, error);
- return error;
- }
+ if (error)
+ return dev_err_probe(pmu->dev, error,
+ "%pOFn: failed to retrieve domain id (reg)\n",
+ np);
child_domain = pmu->genpd_data.domains[idx];
error = pm_genpd_add_subdomain(parent_domain, child_domain);
- if (error) {
- dev_err(pmu->dev, "%s failed to add subdomain %s: %d\n",
- parent_domain->name, child_domain->name, error);
- return error;
- } else {
- dev_dbg(pmu->dev, "%s add subdomain: %s\n",
- parent_domain->name, child_domain->name);
- }
+ if (error)
+ return dev_err_probe(pmu->dev, error,
+ "%s failed to add subdomain %s\n",
+ parent_domain->name, child_domain->name);
+
+ dev_dbg(pmu->dev, "%s add subdomain: %s\n",
+ parent_domain->name, child_domain->name);
error = rockchip_pm_add_subdomain(pmu, np);
if (error)
--
2.55.0
^ permalink raw reply [flat|nested] 4+ messages in thread