diff options
| author |   Steve Glendinning <steve.glendinning@shawell.net> | 2012-09-28 00:57:51 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-09-28 18:35:47 -0400 |
| commit | 8762cec8d9d06eddc9a80293a230d6e073568815 (patch) | |
| tree | ce3bc3c7ac52d0e59c54a6bdaeb8482b0ce7dfd5 /drivers/net/usb | |
| parent | smsc95xx: add wol magic packet support (diff) | |
| download | linux-dev-8762cec8d9d06eddc9a80293a230d6e073568815.tar.xz linux-dev-8762cec8d9d06eddc9a80293a230d6e073568815.zip | |
smsc75xx: add explicit test that device is READY
This patch adds an explicit test that the READY bit is set on
the device when attempting to initialize it.
If this bit is clear then the device hasn't succesfully started
all its clocks, and this patch helps make the resulting logged
error more helpful.
Signed-off-by: Steve Glendinning <steve.glendinning@shawell.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/smsc75xx.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index 376143e8a1aa..1f45f7b2fe63 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c @@ -756,6 +756,26 @@ static int smsc75xx_set_features(struct net_device *netdev, return 0; } +static int smsc75xx_wait_ready(struct usbnet *dev) +{ + int timeout = 0; + + do { + u32 buf; + int ret = smsc75xx_read_reg(dev, PMT_CTL, &buf); + check_warn_return(ret, "Failed to read PMT_CTL: %d", ret); + + if (buf & PMT_CTL_DEV_RDY) + return 0; + + msleep(10); + timeout++; + } while (timeout < 100); + + netdev_warn(dev->net, "timeout waiting for device ready"); + return -EIO; +} + static int smsc75xx_reset(struct usbnet *dev) { struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]); @@ -764,6 +784,9 @@ static int smsc75xx_reset(struct usbnet *dev) netif_dbg(dev, ifup, dev->net, "entering smsc75xx_reset"); + ret = smsc75xx_wait_ready(dev); + check_warn_return(ret, "device not ready in smsc75xx_reset"); + ret = smsc75xx_read_reg(dev, HW_CFG, &buf); check_warn_return(ret, "Failed to read HW_CFG: %d", ret); |