Skip to content

Commit 2aa70f8

Browse files
geertudavem330
authored andcommitted
net: smsc911x: Quieten netif during suspend
If the network interface is kept running during suspend, the net core may call net_device_ops.ndo_start_xmit() while the Ethernet device is still suspended, which may lead to a system crash. E.g. on sh73a0/kzm9g and r8a73a4/ape6evm, the external Ethernet chip is driven by a PM controlled clock. If the Ethernet registers are accessed while the clock is not running, the system will crash with an imprecise external abort. As this is a race condition with a small time window, it is not so easy to trigger at will. Using pm_test may increase your chances: # echo 0 > /sys/module/printk/parameters/console_suspend # echo platform > /sys/power/pm_test # echo mem > /sys/power/state To fix this, make sure the network interface is quietened during suspend. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 7095c97 commit 2aa70f8

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

drivers/net/ethernet/smsc/smsc911x.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2595,6 +2595,11 @@ static int smsc911x_suspend(struct device *dev)
25952595
struct net_device *ndev = dev_get_drvdata(dev);
25962596
struct smsc911x_data *pdata = netdev_priv(ndev);
25972597

2598+
if (netif_running(ndev)) {
2599+
netif_stop_queue(ndev);
2600+
netif_device_detach(ndev);
2601+
}
2602+
25982603
/* enable wake on LAN, energy detection and the external PME
25992604
* signal. */
26002605
smsc911x_reg_write(pdata, PMT_CTRL,
@@ -2628,7 +2633,15 @@ static int smsc911x_resume(struct device *dev)
26282633
while (!(smsc911x_reg_read(pdata, PMT_CTRL) & PMT_CTRL_READY_) && --to)
26292634
udelay(1000);
26302635

2631-
return (to == 0) ? -EIO : 0;
2636+
if (to == 0)
2637+
return -EIO;
2638+
2639+
if (netif_running(ndev)) {
2640+
netif_device_attach(ndev);
2641+
netif_start_queue(ndev);
2642+
}
2643+
2644+
return 0;
26322645
}
26332646

26342647
static const struct dev_pm_ops smsc911x_pm_ops = {

0 commit comments

Comments
 (0)