From: Frank Li <Frank.li@oss.nxp.com>
To: Peng Fan <peng.fan@linux.dev>
Cc: Thomas Gleixner <tglx@kernel.org>, Radu Rendec <radu@rendec.net>,
Frank Li <Frank.Li@nxp.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
Shivamurthy Shastri <shivamurthy.shastri@linutronix.de>,
Anna-Maria Behnsen <anna-maria@linutronix.de>,
Marc Zyngier <maz@kernel.org>,
linux-kernel@vger.kernel.org, imx@lists.linux.dev,
linux-arm-kernel@lists.infradead.org, Peng Fan <peng.fan@nxp.com>
Subject: Re: [PATCH 2/2] irqchip/imx-mu-msi: Fix PM domain teardown on probe errors
Date: Mon, 16 Nov 2026 11:17:45 -0600 [thread overview]
Message-ID: <avs6uc7nwiZAlV-v@SMW015318> (raw)
In-Reply-To: <20261115-imx-mu-msi-v1-2-8beb58854ca4@nxp.com>
On Sun, Nov 15, 2026 at 10:11:26PM +0800, Peng Fan wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> 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@nxp.com>
> ---
Reviewed-by: Frank Li <Frank.Li@nxp.com>
> 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
>
>
prev parent reply other threads:[~2026-11-16 17:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-15 14:11 [PATCH 0/2] irqchip/imx-mu-msi: Fix MSI dispatch and probe error handling Peng Fan
2026-11-15 14:11 ` [PATCH 1/2] irqchip/imx-mu-msi: Fix MSI dispatch through the parent domain Peng Fan
2026-11-16 17:14 ` Frank Li
2026-11-15 14:11 ` [PATCH 2/2] irqchip/imx-mu-msi: Fix PM domain teardown on probe errors Peng Fan
2026-11-16 17:17 ` Frank Li [this message]
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=avs6uc7nwiZAlV-v@SMW015318 \
--to=frank.li@oss.nxp.com \
--cc=Frank.Li@nxp.com \
--cc=anna-maria@linutronix.de \
--cc=festevam@gmail.com \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=peng.fan@linux.dev \
--cc=peng.fan@nxp.com \
--cc=radu@rendec.net \
--cc=s.hauer@pengutronix.de \
--cc=shivamurthy.shastri@linutronix.de \
--cc=tglx@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox