Skip to content

Commit 96340cd

Browse files
Fabio Estevamgregkh
authored andcommitted
smsc95xx: Ignore -ENODEV errors when device is unplugged
commit c70c453 upstream. According to Documentation/driver-api/usb/URB.rst when a device is unplugged usb_submit_urb() returns -ENODEV. This error code propagates all the way up to usbnet_read_cmd() and usbnet_write_cmd() calls inside the smsc95xx.c driver during Ethernet cable unplug, unbind or reboot. This causes the following errors to be shown on reboot, for example: ci_hdrc ci_hdrc.1: remove, state 1 usb usb2: USB disconnect, device number 1 usb 2-1: USB disconnect, device number 2 usb 2-1.1: USB disconnect, device number 3 smsc95xx 2-1.1:1.0 eth1: unregister 'smsc95xx' usb-ci_hdrc.1-1.1, smsc95xx USB 2.0 Ethernet smsc95xx 2-1.1:1.0 eth1: Failed to read reg index 0x00000114: -19 smsc95xx 2-1.1:1.0 eth1: Error reading MII_ACCESS smsc95xx 2-1.1:1.0 eth1: __smsc95xx_mdio_read: MII is busy smsc95xx 2-1.1:1.0 eth1: Failed to read reg index 0x00000114: -19 smsc95xx 2-1.1:1.0 eth1: Error reading MII_ACCESS smsc95xx 2-1.1:1.0 eth1: __smsc95xx_mdio_read: MII is busy smsc95xx 2-1.1:1.0 eth1: hardware isn't capable of remote wakeup usb 2-1.4: USB disconnect, device number 4 ci_hdrc ci_hdrc.1: USB bus 2 deregistered ci_hdrc ci_hdrc.0: remove, state 4 usb usb1: USB disconnect, device number 1 ci_hdrc ci_hdrc.0: USB bus 1 deregistered imx2-wdt 30280000.watchdog: Device shutdown: Expect reboot! reboot: Restarting system Ignore the -ENODEV errors inside __smsc95xx_mdio_read() and __smsc95xx_phy_wait_not_busy() and do not print error messages when -ENODEV is returned. Fixes: a049a30 ("net: usb: Correct PHY handling of smsc95xx") Signed-off-by: Fabio Estevam <festevam@denx.de> Signed-off-by: David S. Miller <davem@davemloft.net> Cc: Fabio Estevam <festevam@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e27b51a commit 96340cd

1 file changed

Lines changed: 20 additions & 8 deletions

File tree

drivers/net/usb/smsc95xx.c

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,10 @@ static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
8484
ret = fn(dev, USB_VENDOR_REQUEST_READ_REGISTER, USB_DIR_IN
8585
| USB_TYPE_VENDOR | USB_RECIP_DEVICE,
8686
0, index, &buf, 4);
87-
if (unlikely(ret < 0)) {
88-
netdev_warn(dev->net, "Failed to read reg index 0x%08x: %d\n",
89-
index, ret);
87+
if (ret < 0) {
88+
if (ret != -ENODEV)
89+
netdev_warn(dev->net, "Failed to read reg index 0x%08x: %d\n",
90+
index, ret);
9091
return ret;
9192
}
9293

@@ -116,7 +117,7 @@ static int __must_check __smsc95xx_write_reg(struct usbnet *dev, u32 index,
116117
ret = fn(dev, USB_VENDOR_REQUEST_WRITE_REGISTER, USB_DIR_OUT
117118
| USB_TYPE_VENDOR | USB_RECIP_DEVICE,
118119
0, index, &buf, 4);
119-
if (unlikely(ret < 0))
120+
if (ret < 0 && ret != -ENODEV)
120121
netdev_warn(dev->net, "Failed to write reg index 0x%08x: %d\n",
121122
index, ret);
122123

@@ -159,6 +160,9 @@ static int __must_check __smsc95xx_phy_wait_not_busy(struct usbnet *dev,
159160
do {
160161
ret = __smsc95xx_read_reg(dev, MII_ADDR, &val, in_pm);
161162
if (ret < 0) {
163+
/* Ignore -ENODEV error during disconnect() */
164+
if (ret == -ENODEV)
165+
return 0;
162166
netdev_warn(dev->net, "Error reading MII_ACCESS\n");
163167
return ret;
164168
}
@@ -194,7 +198,8 @@ static int __smsc95xx_mdio_read(struct usbnet *dev, int phy_id, int idx,
194198
addr = mii_address_cmd(phy_id, idx, MII_READ_ | MII_BUSY_);
195199
ret = __smsc95xx_write_reg(dev, MII_ADDR, addr, in_pm);
196200
if (ret < 0) {
197-
netdev_warn(dev->net, "Error writing MII_ADDR\n");
201+
if (ret != -ENODEV)
202+
netdev_warn(dev->net, "Error writing MII_ADDR\n");
198203
goto done;
199204
}
200205

@@ -206,14 +211,19 @@ static int __smsc95xx_mdio_read(struct usbnet *dev, int phy_id, int idx,
206211

207212
ret = __smsc95xx_read_reg(dev, MII_DATA, &val, in_pm);
208213
if (ret < 0) {
209-
netdev_warn(dev->net, "Error reading MII_DATA\n");
214+
if (ret != -ENODEV)
215+
netdev_warn(dev->net, "Error reading MII_DATA\n");
210216
goto done;
211217
}
212218

213219
ret = (u16)(val & 0xFFFF);
214220

215221
done:
216222
mutex_unlock(&dev->phy_mutex);
223+
224+
/* Ignore -ENODEV error during disconnect() */
225+
if (ret == -ENODEV)
226+
return 0;
217227
return ret;
218228
}
219229

@@ -235,15 +245,17 @@ static void __smsc95xx_mdio_write(struct usbnet *dev, int phy_id,
235245
val = regval;
236246
ret = __smsc95xx_write_reg(dev, MII_DATA, val, in_pm);
237247
if (ret < 0) {
238-
netdev_warn(dev->net, "Error writing MII_DATA\n");
248+
if (ret != -ENODEV)
249+
netdev_warn(dev->net, "Error writing MII_DATA\n");
239250
goto done;
240251
}
241252

242253
/* set the address, index & direction (write to PHY) */
243254
addr = mii_address_cmd(phy_id, idx, MII_WRITE_ | MII_BUSY_);
244255
ret = __smsc95xx_write_reg(dev, MII_ADDR, addr, in_pm);
245256
if (ret < 0) {
246-
netdev_warn(dev->net, "Error writing MII_ADDR\n");
257+
if (ret != -ENODEV)
258+
netdev_warn(dev->net, "Error writing MII_ADDR\n");
247259
goto done;
248260
}
249261

0 commit comments

Comments
 (0)