Skip to contentSkip to conversation

net: mvpp2: Fix IRQ error handling

PATCH In review [email protected] 2 participants 3 messages Aug 24 – Aug 27

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: mvpp2: Fix IRQ error handling

From: bui duc phuc <[email protected]>

irq_of_parse_and_map() returns 0 when parsing or mapping an IRQ fails. The current code does not handle this return value correctly.

Check for a zero return value and return -EINVAL when the IRQ lookup fails.

Fixes 591f4cfab38a ("net: mvpp2: introduce queue_vector concept")
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +1 -1
index ccc24a1301f2..1c50174c9f1e 100644
@@ -5874,7 +5874,7 @@ static int mvpp2_simple_queue_vectors_init(struct mvpp2_port *port,
 	v->sw_thread_mask = *cpumask_bits(cpu_online_mask);
 	v->port = port;
 	v->irq = irq_of_parse_and_map(port_node, 0);
-	if (v->irq <= 0)
+	if (!v->irq)
 		return -EINVAL;
 	netif_napi_add(port->dev, &v->napi, mvpp2_poll);
 
Signature · 1 line
2.43.0
reviewer
#1 lore raw
Quoted 19 lines · On Mon, Aug 24, 2026 at 05:07:58PM +0700, [email protected] wrote:

From: bui duc phuc <[email protected]>

irq_of_parse_and_map() returns 0 when parsing or mapping an IRQ fails. The current code does not handle this return value correctly.

Check for a zero return value and return -EINVAL when the IRQ lookup fails.

Fixes 591f4cfab38a ("net: mvpp2: introduce queue_vector concept")
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +0 -0
index ccc24a1301f2..1c50174c9f1e 100644

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c static int mvpp2_simple_queue_vectors_init(struct mvpp2_port *port, · line 5879

Quoted 7 lines
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +1 -1
@@ -5874,7 +5874,7 @@ static int mvpp2_simple_queue_vectors_init(struct mvpp2_port *port,
 	v->sw_thread_mask = *cpumask_bits(cpu_online_mask);
 	v->port = port;
 	v->irq = irq_of_parse_and_map(port_node, 0);
-	if (v->irq <= 0)
+	if (!v->irq)
 		return -EINVAL;
 	netif_napi_add(port->dev, &v->napi, mvpp2_poll);

Hi,

Thanks for your patch.

As pointed out by an AI-generated review [1], although the current condition is unnecessarily wide, it does correctly catch the v->irq == 0 case.

So this is a clean-up rather than a bug fix.
And should be for net-next, without a Fixes tag, rather than net.

Please also note that net-next is closed for the merge window. I expect it to reopen in early September. Please don't post patches for net-next until it reopens.

[1] https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260824100758.31622-1-phucduc.bui%40gmail.com

Signature · 1 line
pw-bot: changes-requested
#2 lore raw

Hi Simon,

Thanks for clarifying.

Quoted 5 lines

As pointed out by an AI-generated review [1], although the current condition is unnecessarily wide, it does correctly catch the v->irq == 0 case.

Quoted 9 lines

So this is a clean-up rather than a bug fix.
And should be for net-next, without a Fixes tag, rather than net.

Please also note that net-next is closed for the merge window. I expect it to reopen in early September. Please don't post patches for net-next until it reopens.

[1] https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260824100758.31622-1-phucduc.bui%40gmail.com

I'll resend the patch to net-next after August 31.

Best regards,
Phuc