[PATCH 2/2] irqchip/imx-mu-msi: Fix PM domain teardown on probe errors

From: Peng Fan

Date: Sun Nov 15 2026 - 09:11:59 EST


From: Peng Fan <peng.fan@xxxxxxx>

dev_pm_domain_attach_by_name() creates a virtual device for each
attached PM domain, which must be released with dev_pm_domain_detach().
The probe error paths only remove the device links, leaking both
virtual devices. They also return -EINVAL instead of the actual error
from imx_mu_msi_domains_init() and log the wrong domain name when the
link for the second domain cannot be created.

Detach the PM domains on every failure path and propagate the real
error code. Since the power-domains property is optional in the
fsl,mu-msi binding, treat a NULL domain as "not present" and skip the
corresponding device link rather than failing the probe.

Fixes: 70afdab904d2 ("irqchip: Add IMX MU MSI controller driver")
Signed-off-by: Peng Fan <peng.fan@xxxxxxx>
---
drivers/irqchip/irq-imx-mu-msi.c | 69 ++++++++++++++++++++++++----------------
1 file changed, 41 insertions(+), 28 deletions(-)

diff --git a/drivers/irqchip/irq-imx-mu-msi.c b/drivers/irqchip/irq-imx-mu-msi.c
index c42ea0797624..42e930caed8d 100644
--- a/drivers/irqchip/irq-imx-mu-msi.c
+++ b/drivers/irqchip/irq-imx-mu-msi.c
@@ -300,8 +300,8 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8ulp = {
static int imx_mu_probe(struct platform_device *pdev, struct device_node *parent,
const struct imx_mu_dcfg *cfg)
{
- struct device_link *pd_link_a;
- struct device_link *pd_link_b;
+ struct device_link *pd_link_a = NULL;
+ struct device_link *pd_link_b = NULL;
struct imx_mu_msi *msi_data;
struct resource *res;
struct device *pd_a;
@@ -345,33 +345,38 @@ static int imx_mu_probe(struct platform_device *pdev, struct device_node *parent
return PTR_ERR(pd_a);

pd_b = dev_pm_domain_attach_by_name(dev, "processor-b-side");
- if (IS_ERR(pd_b))
- return PTR_ERR(pd_b);
-
- pd_link_a = device_link_add(dev, pd_a,
- DL_FLAG_STATELESS |
- DL_FLAG_PM_RUNTIME |
- DL_FLAG_RPM_ACTIVE);
-
- if (!pd_link_a) {
- dev_err(dev, "Failed to add device_link to mu a.\n");
- goto err_pd_a;
+ if (IS_ERR(pd_b)) {
+ ret = PTR_ERR(pd_b);
+ goto err_detach_a;
}

- pd_link_b = device_link_add(dev, pd_b,
- DL_FLAG_STATELESS |
- DL_FLAG_PM_RUNTIME |
- DL_FLAG_RPM_ACTIVE);
-
+ if (pd_a) {
+ pd_link_a = device_link_add(dev, pd_a,
+ DL_FLAG_STATELESS |
+ DL_FLAG_PM_RUNTIME |
+ DL_FLAG_RPM_ACTIVE);
+ if (!pd_link_a) {
+ dev_err(dev, "Failed to add device_link to mu a.\n");
+ ret = -ENODEV;
+ goto err_detach;
+ }
+ }

- if (!pd_link_b) {
- dev_err(dev, "Failed to add device_link to mu a.\n");
- goto err_pd_b;
+ if (pd_b) {
+ pd_link_b = device_link_add(dev, pd_b,
+ DL_FLAG_STATELESS |
+ DL_FLAG_PM_RUNTIME |
+ DL_FLAG_RPM_ACTIVE);
+ if (!pd_link_b) {
+ dev_err(dev, "Failed to add device_link to mu b.\n");
+ ret = -ENODEV;
+ goto err_remove_link_a;
+ }
}

ret = imx_mu_msi_domains_init(msi_data, dev);
if (ret)
- goto err_dm_init;
+ goto err_remove_links;

pm_runtime_enable(dev);

@@ -381,12 +386,20 @@ static int imx_mu_probe(struct platform_device *pdev, struct device_node *parent

return 0;

-err_dm_init:
- device_link_remove(dev, pd_b);
-err_pd_b:
- device_link_remove(dev, pd_a);
-err_pd_a:
- return -EINVAL;
+err_remove_links:
+ if (pd_link_b)
+ device_link_remove(dev, pd_b);
+err_remove_link_a:
+ if (pd_link_a)
+ device_link_remove(dev, pd_a);
+err_detach:
+ if (pd_b)
+ dev_pm_domain_detach(pd_b, true);
+err_detach_a:
+ if (pd_a)
+ dev_pm_domain_detach(pd_a, true);
+
+ return ret;
}

static int __maybe_unused imx_mu_runtime_suspend(struct device *dev)

--
2.56.0