Commit 8762cec8 authored by Steve Glendinning's avatar Steve Glendinning Committed by David S. Miller

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: default avatarSteve Glendinning <steve.glendinning@shawell.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0e474a8
...@@ -756,6 +756,26 @@ static int smsc75xx_set_features(struct net_device *netdev, ...@@ -756,6 +756,26 @@ static int smsc75xx_set_features(struct net_device *netdev,
return 0; 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) static int smsc75xx_reset(struct usbnet *dev)
{ {
struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]); struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
...@@ -764,6 +784,9 @@ static int smsc75xx_reset(struct usbnet *dev) ...@@ -764,6 +784,9 @@ static int smsc75xx_reset(struct usbnet *dev)
netif_dbg(dev, ifup, dev->net, "entering smsc75xx_reset"); 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); ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
check_warn_return(ret, "Failed to read HW_CFG: %d", ret); check_warn_return(ret, "Failed to read HW_CFG: %d", ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment