[PATCH] irqchip/renesas-rzv2h: unwind on IRQ setup error

[PATCH] irqchip/renesas-rzv2h: unwind on IRQ setup error

[Cosmin Tanislav]

The call to rzv2h_icu_setup_irqs() may fail after the syscore ops have
been registered and the IRQ domain has been created. In that case, only
the runtime PM usage count is unwound.

Unregister the syscore ops and remove the IRQ domain on this error path.

Signed-off-by: Cosmin Tanislav <cosmin-gabriel.tanislav.xa@renesas.com>
---
 drivers/irqchip/irq-renesas-rzv2h.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-renesas-rzv2h.c b/drivers/irqchip/irq-renesas-rzv2h.c
index 31c543c876b1..b11fa48c1996 100644
--- a/drivers/irqchip/irq-renesas-rzv2h.c
+++ b/drivers/irqchip/irq-renesas-rzv2h.c
@@ -865,7 +865,7 @@ static int rzv2h_icu_probe_common(struct platform_device *pdev, struct device_no
 
 	ret = rzv2h_icu_setup_irqs(pdev, irq_domain);
 	if (ret)
-		goto pm_put;
+		goto unregister_syscore;
 
 	/*
 	 * coccicheck complains about a missing put_device call before returning, but it's a false
@@ -873,6 +873,9 @@ static int rzv2h_icu_probe_common(struct platform_device *pdev, struct device_no
 	 */
 	return 0;
 
+unregister_syscore:
+	unregister_syscore(&rzv2h_irqc_syscore);
+	irq_domain_remove(irq_domain);
 pm_put:
 	pm_runtime_put_sync(dev);
 	return ret;
-- 
2.54.0

[tip: irq/urgent] irqchip/renesas-rzv2h: Unwind on setup error

[tip-bot2 for Cosmin Tanislav]

The following commit has been merged into the irq/urgent branch of tip:

Commit-ID:     91f742be16497a435c929b3350d58b12acb16ce5
Gitweb:        https://git.kernel.org/tip/91f742be16497a435c929b3350d58b12acb16ce5
Author:        Cosmin Tanislav <cosmin-gabriel.tanislav.xa@renesas.com>
AuthorDate:    Wed, 20 May 2026 23:17:36 +03:00
Committer:     Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 21 May 2026 11:48:30 +02:00

irqchip/renesas-rzv2h: Unwind on setup error

The call to rzv2h_icu_setup_irqs() may fail after the syscore ops have
been registered and the interrupt domain has been created. In that case, only
the runtime PM usage count is unwound.

Unregister the syscore ops and remove the interrupt domain on this error path.

Signed-off-by: Cosmin Tanislav <cosmin-gabriel.tanislav.xa@renesas.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260520201736.1509741-1-cosmin-gabriel.tanislav.xa@renesas.com
---
 drivers/irqchip/irq-renesas-rzv2h.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-renesas-rzv2h.c b/drivers/irqchip/irq-renesas-rzv2h.c
index 31c543c..b11fa48 100644
--- a/drivers/irqchip/irq-renesas-rzv2h.c
+++ b/drivers/irqchip/irq-renesas-rzv2h.c
@@ -865,7 +865,7 @@ static int rzv2h_icu_probe_common(struct platform_device *pdev, struct device_no
 
 	ret = rzv2h_icu_setup_irqs(pdev, irq_domain);
 	if (ret)
-		goto pm_put;
+		goto unregister_syscore;
 
 	/*
 	 * coccicheck complains about a missing put_device call before returning, but it's a false
@@ -873,6 +873,9 @@ static int rzv2h_icu_probe_common(struct platform_device *pdev, struct device_no
 	 */
 	return 0;
 
+unregister_syscore:
+	unregister_syscore(&rzv2h_irqc_syscore);
+	irq_domain_remove(irq_domain);
 pm_put:
 	pm_runtime_put_sync(dev);
 	return ret;

RE: [tip: irq/urgent] irqchip/renesas-rzv2h: Unwind on setup error

[Cosmin-Gabriel Tanislav]

> From: tip-bot2@linutronix.de <tip-bot2@linutronix.de>
> Sent: Thursday, May 21, 2026 12:51 PM
> 
> The following commit has been merged into the irq/urgent branch of tip:
> 

Hi Thomas.

Sashiko identified some valid issues with this patch, I'm working on
addressing them. I think we shouldn't be merging this patch for now if
possible.

https://sashiko.dev/#/patchset/20260520201736.1509741-1-cosmin-gabriel.tanislav.xa%40renesas.com

> Commit-ID:     91f742be16497a435c929b3350d58b12acb16ce5
> Gitweb:        https://git.kernel.org/tip/91f742be16497a435c929b3350d58b12acb16ce5
> Author:        Cosmin Tanislav <cosmin-gabriel.tanislav.xa@renesas.com>
> AuthorDate:    Wed, 20 May 2026 23:17:36 +03:00
> Committer:     Thomas Gleixner <tglx@kernel.org>
> CommitterDate: Thu, 21 May 2026 11:48:30 +02:00
> 
> irqchip/renesas-rzv2h: Unwind on setup error
> 
> The call to rzv2h_icu_setup_irqs() may fail after the syscore ops have
> been registered and the interrupt domain has been created. In that case, only
> the runtime PM usage count is unwound.
> 
> Unregister the syscore ops and remove the interrupt domain on this error path.
> 
> Signed-off-by: Cosmin Tanislav <cosmin-gabriel.tanislav.xa@renesas.com>
> Signed-off-by: Thomas Gleixner <tglx@kernel.org>
> Link: https://patch.msgid.link/20260520201736.1509741-1-cosmin-gabriel.tanislav.xa@renesas.com
> ---
>  drivers/irqchip/irq-renesas-rzv2h.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/irqchip/irq-renesas-rzv2h.c b/drivers/irqchip/irq-renesas-rzv2h.c
> index 31c543c..b11fa48 100644
> --- a/drivers/irqchip/irq-renesas-rzv2h.c
> +++ b/drivers/irqchip/irq-renesas-rzv2h.c
> @@ -865,7 +865,7 @@ static int rzv2h_icu_probe_common(struct platform_device *pdev, struct device_no
> 
>         ret = rzv2h_icu_setup_irqs(pdev, irq_domain);
>         if (ret)
> -               goto pm_put;
> +               goto unregister_syscore;
> 
>         /*
>          * coccicheck complains about a missing put_device call before returning, but it's a false
> @@ -873,6 +873,9 @@ static int rzv2h_icu_probe_common(struct platform_device *pdev, struct device_no
>          */
>         return 0;
> 
> +unregister_syscore:
> +       unregister_syscore(&rzv2h_irqc_syscore);
> +       irq_domain_remove(irq_domain);
>  pm_put:
>         pm_runtime_put_sync(dev);
>         return ret;

RE: [tip: irq/urgent] irqchip/renesas-rzv2h: Unwind on setup error

[Thomas Gleixner]

On Thu, May 21 2026 at 09:58, Cosmin-Gabriel Tanislav wrote:
>> From: tip-bot2@linutronix.de <tip-bot2@linutronix.de>
>> Sent: Thursday, May 21, 2026 12:51 PM
>> 
>> The following commit has been merged into the irq/urgent branch of tip:
>> 
>
> Hi Thomas.
>
> Sashiko identified some valid issues with this patch, I'm working on

Indeed.

> addressing them. I think we shouldn't be merging this patch for now if
> possible.

I removed it from the urgent branch.

Re: [PATCH] irqchip/renesas-rzv2h: unwind on IRQ setup error

[Geert Uytterhoeven]

On Wed, 20 May 2026 at 22:18, Cosmin Tanislav
<cosmin-gabriel.tanislav.xa@renesas.com> wrote:
> The call to rzv2h_icu_setup_irqs() may fail after the syscore ops have
> been registered and the IRQ domain has been created. In that case, only
> the runtime PM usage count is unwound.
>
> Unregister the syscore ops and remove the IRQ domain on this error path.
>
> Signed-off-by: Cosmin Tanislav <cosmin-gabriel.tanislav.xa@renesas.com>

Fixes: 61adc4813d67990f ("irqchip/renesas-rzv2h: Add CA55 software
interrupt support")
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds