Skip to content

Commit f8b3903

Browse files
chleroydavem330
authored andcommitted
net: fs_enet: do not call phy_stop() in interrupts
In case of TX timeout, fs_timeout() calls phy_stop(), which triggers the following BUG_ON() as we are in interrupt. [92708.199889] kernel BUG at drivers/net/phy/mdio_bus.c:482! [92708.204985] Oops: Exception in kernel mode, sig: 5 [#1] [92708.210119] PREEMPT [92708.212107] CMPC885 [92708.214216] CPU: 0 PID: 3 Comm: ksoftirqd/0 Tainted: G W 4.9.61 #39 [92708.223227] task: c60f0a40 task.stack: c6104000 [92708.227697] NIP: c02a84bc LR: c02a947c CTR: c02a93d8 [92708.232614] REGS: c6105c70 TRAP: 0700 Tainted: G W (4.9.61) [92708.241193] MSR: 00021032 <ME,IR,DR,RI>[92708.244818] CR: 24000822 XER: 20000000 [92708.248767] GPR00: c02a947c c6105d20 c60f0a40 c62b4c00 00000005 0000001f c069aad8 0001a688 GPR08: 00000007 00000100 c02a93d8 00000000 000005fc 00000000 c6213240 c06338e4 GPR16: 00000001 c06330d4 c0633094 00000000 c0680000 c6104000 c6104000 00000000 GPR24: 00000200 00000000 ffffffff 00000004 00000078 00009032 00000000 c62b4c00 NIP [c02a84bc] mdiobus_read+0x20/0x74 [92708.281517] LR [c02a947c] kszphy_config_intr+0xa4/0xc4 [92708.286547] Call Trace: [92708.288980] [c6105d20] [c6104000] 0xc6104000 (unreliable) [92708.294339] [c6105d40] [c02a947c] kszphy_config_intr+0xa4/0xc4 [92708.300098] [c6105d50] [c02a5330] phy_stop+0x60/0x9c [92708.305007] [c6105d60] [c02c84d0] fs_timeout+0xdc/0x110 [92708.310197] [c6105d80] [c035cd48] dev_watchdog+0x268/0x2a0 [92708.315593] [c6105db0] [c0060288] call_timer_fn+0x34/0x17c [92708.321014] [c6105dd0] [c00605f0] run_timer_softirq+0x21c/0x2e4 [92708.326887] [c6105e50] [c001e19c] __do_softirq+0xf4/0x2f4 [92708.332207] [c6105eb0] [c001e3c8] run_ksoftirqd+0x2c/0x40 [92708.337560] [c6105ec0] [c003b420] smpboot_thread_fn+0x1f0/0x258 [92708.343405] [c6105ef0] [c003745c] kthread+0xbc/0xd0 [92708.348217] [c6105f40] [c000c400] ret_from_kernel_thread+0x5c/0x64 [92708.354275] Instruction dump: [92708.357207] 7c0803a6 bbc10018 38210020 4e800020 7c0802a6 9421ffe0 54290024 bfc10018 [92708.364865] 90010024 7c7f1b78 81290008 552902ee <0f090000> 3bc3002c 7fc3f378 90810008 [92708.372711] ---[ end trace 42b05441616fafd7 ]--- This patch moves fs_timeout() actions into an async worker. Fixes: commit 48257c4 ("Add fs_enet ethernet network driver, for several embedded platforms") Signed-off-by: Christophe Leroy <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 0b16551 commit f8b3903

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -613,9 +613,11 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
613613
return NETDEV_TX_OK;
614614
}
615615

616-
static void fs_timeout(struct net_device *dev)
616+
static void fs_timeout_work(struct work_struct *work)
617617
{
618-
struct fs_enet_private *fep = netdev_priv(dev);
618+
struct fs_enet_private *fep = container_of(work, struct fs_enet_private,
619+
timeout_work);
620+
struct net_device *dev = fep->ndev;
619621
unsigned long flags;
620622
int wake = 0;
621623

@@ -627,7 +629,6 @@ static void fs_timeout(struct net_device *dev)
627629
phy_stop(dev->phydev);
628630
(*fep->ops->stop)(dev);
629631
(*fep->ops->restart)(dev);
630-
phy_start(dev->phydev);
631632
}
632633

633634
phy_start(dev->phydev);
@@ -639,6 +640,13 @@ static void fs_timeout(struct net_device *dev)
639640
netif_wake_queue(dev);
640641
}
641642

643+
static void fs_timeout(struct net_device *dev)
644+
{
645+
struct fs_enet_private *fep = netdev_priv(dev);
646+
647+
schedule_work(&fep->timeout_work);
648+
}
649+
642650
/*-----------------------------------------------------------------------------
643651
* generic link-change handler - should be sufficient for most cases
644652
*-----------------------------------------------------------------------------*/
@@ -759,6 +767,7 @@ static int fs_enet_close(struct net_device *dev)
759767
netif_stop_queue(dev);
760768
netif_carrier_off(dev);
761769
napi_disable(&fep->napi);
770+
cancel_work_sync(&fep->timeout_work);
762771
phy_stop(dev->phydev);
763772

764773
spin_lock_irqsave(&fep->lock, flags);
@@ -1019,6 +1028,7 @@ static int fs_enet_probe(struct platform_device *ofdev)
10191028

10201029
ndev->netdev_ops = &fs_enet_netdev_ops;
10211030
ndev->watchdog_timeo = 2 * HZ;
1031+
INIT_WORK(&fep->timeout_work, fs_timeout_work);
10221032
netif_napi_add(ndev, &fep->napi, fs_enet_napi, fpi->napi_weight);
10231033

10241034
ndev->ethtool_ops = &fs_ethtool_ops;

drivers/net/ethernet/freescale/fs_enet/fs_enet.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ struct fs_enet_private {
125125
spinlock_t lock; /* during all ops except TX pckt processing */
126126
spinlock_t tx_lock; /* during fs_start_xmit and fs_tx */
127127
struct fs_platform_info *fpi;
128+
struct work_struct timeout_work;
128129
const struct fs_ops *ops;
129130
int rx_ring, tx_ring;
130131
dma_addr_t ring_mem_addr;

0 commit comments

Comments
 (0)