github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 20:54:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

staging: octeon: Propagate rx initialization failures

Browse Source 
Instead of calling panic(), log and propagate the error upwards for
better error handling.

Signed-off-by: Prashant Rahul <prashantrahul23@gmail.com>
Tested-by: Klara Modin <klarasmodin@gmail.com>
Tested-by: Klara Modin <klarasomdin@gmail.com>
Link: https://patch.msgid.link/20260702-staging-driver-octeon-panic-v2-2-2c2b6ae086dd@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Prashant Rahul 2026-07-02 12:36:15 +05:30 committed by Greg Kroah-Hartman
parent a30679ddf1
commit ae43503640
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/octeon/ethernet-rx.c
View File

@ -5,6 +5,8 @@
* Copyright (c) 2003-2010 Cavium Networks
*/
#include <asm-generic/errno-base.h>
#include <linux/dev_printk.h>
#include <linux/platform_device.h>
#include <linux/module.h>
#include <linux/kernel.h>
@ -445,7 +447,7 @@ void cvm_oct_poll_controller(struct net_device *dev)
}
#endif
void cvm_oct_rx_initialize(struct platform_device *pdev)
int cvm_oct_rx_initialize(struct platform_device *pdev)
{
int i;
struct net_device *dev_for_napi = NULL;
@ -459,8 +461,10 @@ void cvm_oct_rx_initialize(struct platform_device *pdev)
}
}
if (!dev_for_napi)
panic("No net_devices were allocated.");
if (!dev_for_napi) {
dev_err(&pdev->dev, "No net_devices were allocated.");
return -ENODEV;
}
for (i = 0; i < ARRAY_SIZE(plat->rx_group); i++) {
int ret;
@ -479,9 +483,10 @@ void cvm_oct_rx_initialize(struct platform_device *pdev)
/* Register an IRQ handler to receive POW interrupts */
ret = request_irq(rx_group[i].irq, cvm_oct_do_interrupt, 0,
"Ethernet", &rx_group[i].napi);
if (ret)
panic("Could not acquire Ethernet IRQ %d\n",
rx_group[i].irq);
if (ret) {
dev_err(&pdev->dev, "Could not acquire Ethernet IRQ %d\n", rx_group[i].irq);
return ret;
}
disable_irq_nosync(rx_group[i].irq);
@ -518,6 +523,7 @@ void cvm_oct_rx_initialize(struct platform_device *pdev)
napi_schedule(&rx_group[i].napi);
}
atomic_inc(&oct_rx_ready);
return 0;
}
void cvm_oct_rx_shutdown(struct platform_device *pdev)

2
drivers/staging/octeon/ethernet-rx.h
View File

@ -8,7 +8,7 @@
struct platform_device;
void cvm_oct_poll_controller(struct net_device *dev);
void cvm_oct_rx_initialize(struct platform_device *pdev);
int cvm_oct_rx_initialize(struct platform_device *pdev);
void cvm_oct_rx_shutdown(struct platform_device *pdev);
static inline void cvm_oct_rx_refill_pool(struct platform_device *pdev,