iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cx82310_eth: wait for firmware to become ready

Browse Source 
When the device is powered up, some (older) firmware versions fail to work
properly if we send commands before the boot is complete (everything is OK
when the device is hot-plugged). The firmware indicates its ready status by
putting the link up.
Newer firmwares delay the first command so they don't suffer from this problem.
They also report the link being always up.

Wait for firmware to become ready (link up) before sending any commands and/or
data.

This also allows lowering CMD_TIMEOUT value to a reasonable time.

Tested with 4.1.0.9 (old) and 4.1.0.30 (new) firmware versions.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ondrej Zary 2015-03-21 11:29:37 +01:00 committed by David S. Miller
parent 4de930efc2
commit f40bff4239
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/net/usb/cx82310_eth.c
View File

@ -46,8 +46,7 @@ enum cx82310_status {
}; };
#define CMD_PACKET_SIZE 64 #define CMD_PACKET_SIZE 64
/* first command after power on can take around 8 seconds */ #define CMD_TIMEOUT 100
#define CMD_TIMEOUT 15000
#define CMD_REPLY_RETRY 5 #define CMD_REPLY_RETRY 5
#define CX82310_MTU 1514 #define CX82310_MTU 1514
@ -78,8 +77,9 @@ static int cx82310_cmd(struct usbnet *dev, enum cx82310_cmd cmd, bool reply,
ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, CMD_EP), buf, ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, CMD_EP), buf,
CMD_PACKET_SIZE, &actual_len, CMD_TIMEOUT); CMD_PACKET_SIZE, &actual_len, CMD_TIMEOUT);
if (ret < 0) { if (ret < 0) {
dev_err(&dev->udev->dev, "send command %#x: error %d\n", if (cmd != CMD_GET_LINK_STATUS)
cmd, ret); dev_err(&dev->udev->dev, "send command %#x: error %d\n",
cmd, ret);
goto end; goto end;
} }
@ -90,8 +90,10 @@ static int cx82310_cmd(struct usbnet *dev, enum cx82310_cmd cmd, bool reply,
buf, CMD_PACKET_SIZE, &actual_len, buf, CMD_PACKET_SIZE, &actual_len,
CMD_TIMEOUT); CMD_TIMEOUT);
if (ret < 0) { if (ret < 0) {
dev_err(&dev->udev->dev, if (cmd != CMD_GET_LINK_STATUS)
"reply receive error %d\n", ret); dev_err(&dev->udev->dev,
"reply receive error %d\n",
ret);
goto end; goto end;
} }
if (actual_len > 0) if (actual_len > 0)
@ -134,6 +136,8 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf)
int ret; int ret;
char buf[15]; char buf[15];
struct usb_device *udev = dev->udev; struct usb_device *udev = dev->udev;
u8 link[3];
int timeout = 50;
/* avoid ADSL modems - continue only if iProduct is "USB NET CARD" */ /* avoid ADSL modems - continue only if iProduct is "USB NET CARD" */
if (usb_string(udev, udev->descriptor.iProduct, buf, sizeof(buf)) > 0 if (usb_string(udev, udev->descriptor.iProduct, buf, sizeof(buf)) > 0
@ -160,6 +164,20 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf)
if (!dev->partial_data) if (!dev->partial_data)
return -ENOMEM; return -ENOMEM;
/* wait for firmware to become ready (indicated by the link being up) */
while (--timeout) {
ret = cx82310_cmd(dev, CMD_GET_LINK_STATUS, true, NULL, 0,
link, sizeof(link));
/* the command can time out during boot - it's not an error */
if (!ret && link[0] == 1 && link[2] == 1)
break;
msleep(500);
};
if (!timeout) {
dev_err(&udev->dev, "firmware not ready in time\n");
return -ETIMEDOUT;
}
/* enable ethernet mode (?) */ /* enable ethernet mode (?) */
ret = cx82310_cmd(dev, CMD_ETHERNET_MODE, true, "\x01", 1, NULL, 0); ret = cx82310_cmd(dev, CMD_ETHERNET_MODE, true, "\x01", 1, NULL, 0);
if (ret) { if (ret) {