3 files changed, 363 insertions, 0 deletions

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index d7b7018a1de1..52ffabe6db0e 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -358,6 +358,14 @@ config USB_NET_ZAURUS
           really need this non-conformant variant of CDC Ethernet (or in
           some cases CDC MDLM) protocol, not "g_ether".
 
+config USB_NET_CX82310_ETH
+        tristate "Conexant CX82310 USB ethernet port"
+        depends on USB_USBNET
+        help
+          Choose this option if you're using a Conexant CX82310-based ADSL
+          router with USB ethernet port. This driver is for routers only,
+          it will not work with ADSL modems (use cxacru driver instead).
+
 config USB_HSO
         tristate "Option USB High Speed Mobile Devices"
         depends on USB && RFKILL
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile
index b13a279663ba..a19b0259ae16 100644
--- a/drivers/net/usb/Makefile
+++ b/drivers/net/usb/Makefile
@@ -25,4 +25,5 @@ obj-$(CONFIG_USB_NET_INT51X1)	+= int51x1.o
 obj-$(CONFIG_USB_CDC_PHONET)    += cdc-phonet.o
 obj-$(CONFIG_USB_IPHETH)        += ipheth.o
 obj-$(CONFIG_USB_SIERRA_NET)    += sierra_net.o
+obj-$(CONFIG_USB_NET_CX82310_ETH)       += cx82310_eth.o
 
diff --git a/drivers/net/usb/cx82310_eth.c b/drivers/net/usb/cx82310_eth.c
new file mode 100644
index 000000000000..6fbe03276b27
--- /dev/null
+++ b/drivers/net/usb/cx82310_eth.c
@@ -0,0 +1,354 @@
+/*
+ * Driver for USB ethernet port of Conexant CX82310-based ADSL routers
+ * Copyright (C) 2010 by Ondrej Zary
+ * some parts inspired by the cxacru driver
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/workqueue.h>
+#include <linux/mii.h>
+#include <linux/usb.h>
+#include <linux/usb/usbnet.h>
+
+enum cx82310_cmd {
+        CMD_START               = 0x84, /* no effect? */
+        CMD_STOP                = 0x85, /* no effect? */
+        CMD_GET_STATUS          = 0x90, /* returns nothing? */
+        CMD_GET_MAC_ADDR        = 0x91, /* read MAC address */
+        CMD_GET_LINK_STATUS     = 0x92, /* not useful, link is always up */
+        CMD_ETHERNET_MODE       = 0x99, /* unknown, needed during init */
+};
+
+enum cx82310_status {
+        STATUS_UNDEFINED,
+        STATUS_SUCCESS,
+        STATUS_ERROR,
+        STATUS_UNSUPPORTED,
+        STATUS_UNIMPLEMENTED,
+        STATUS_PARAMETER_ERROR,
+        STATUS_DBG_LOOPBACK,
+};
+
+#define CMD_PACKET_SIZE 64
+/* first command after power on can take around 8 seconds */
+#define CMD_TIMEOUT     15000
+#define CMD_REPLY_RETRY 5
+
+#define CX82310_MTU     1514
+#define CMD_EP          0x01
+
+/*
+ * execute control command
+ *  - optionally send some data (command parameters)
+ *  - optionally wait for the reply
+ *  - optionally read some data from the reply
+ */
+static int cx82310_cmd(struct usbnet *dev, enum cx82310_cmd cmd, bool reply,
+                       u8 *wdata, int wlen, u8 *rdata, int rlen)
+{
+        int actual_len, retries, ret;
+        struct usb_device *udev = dev->udev;
+        u8 *buf = kzalloc(CMD_PACKET_SIZE, GFP_KERNEL);
+
+        if (!buf)
+                return -ENOMEM;
+
+        /* create command packet */
+        buf[0] = cmd;
+        if (wdata)
+                memcpy(buf + 4, wdata, min_t(int, wlen, CMD_PACKET_SIZE - 4));
+
+        /* send command packet */
+        ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, CMD_EP), buf,
+                           CMD_PACKET_SIZE, &actual_len, CMD_TIMEOUT);
+        if (ret < 0) {
+                dev_err(&dev->udev->dev, "send command %#x: error %d\n",
+                        cmd, ret);
+                goto end;
+        }
+
+        if (reply) {
+                /* wait for reply, retry if it's empty */
+                for (retries = 0; retries < CMD_REPLY_RETRY; retries++) {
+                        ret = usb_bulk_msg(udev, usb_rcvbulkpipe(udev, CMD_EP),
+                                           buf, CMD_PACKET_SIZE, &actual_len,
+                                           CMD_TIMEOUT);
+                        if (ret < 0) {
+                                dev_err(&dev->udev->dev,
+                                        "reply receive error %d\n", ret);
+                                goto end;
+                        }
+                        if (actual_len > 0)
+                                break;
+                }
+                if (actual_len == 0) {
+                        dev_err(&dev->udev->dev, "no reply to command %#x\n",
+                                cmd);
+                        ret = -EIO;
+                        goto end;
+                }
+                if (buf[0] != cmd) {
+                        dev_err(&dev->udev->dev,
+                                "got reply to command %#x, expected: %#x\n",
+                                buf[0], cmd);
+                        ret = -EIO;
+                        goto end;
+                }
+                if (buf[1] != STATUS_SUCCESS) {
+                        dev_err(&dev->udev->dev, "command %#x failed: %#x\n",
+                                cmd, buf[1]);
+                        ret = -EIO;
+                        goto end;
+                }
+                if (rdata)
+                        memcpy(rdata, buf + 4,
+                               min_t(int, rlen, CMD_PACKET_SIZE - 4));
+        }
+end:
+        kfree(buf);
+        return ret;
+}
+
+#define partial_len     data[0]         /* length of partial packet data */
+#define partial_rem     data[1]         /* remaining (missing) data length */
+#define partial_data    data[2]         /* partial packet data */
+
+static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf)
+{
+        int ret;
+        char buf[15];
+        struct usb_device *udev = dev->udev;
+
+        /* avoid ADSL modems - continue only if iProduct is "USB NET CARD" */
+        if (udev->descriptor.iProduct &&
+            usb_string(udev, udev->descriptor.iProduct, buf, sizeof(buf)) &&
+            strcmp(buf, "USB NET CARD")) {
+                dev_err(&udev->dev,
+                        "probably an ADSL modem, use cxacru driver instead\n");
+                return -ENODEV;
+        }
+
+        ret = usbnet_get_endpoints(dev, intf);
+        if (ret)
+                return ret;
+
+        /*
+         * this must not include ethernet header as the device can send partial
+         * packets with no header (URB is at least 2 bytes long, so 2 is OK)
+         */
+        dev->net->hard_header_len = 2;
+        /* we can send at most 1514 bytes of data (+ 2-byte header) per URB */
+        dev->hard_mtu = CX82310_MTU + dev->net->hard_header_len;
+        /* we can receive URBs up to 4KB from the device */
+        dev->rx_urb_size = 4096;
+
+        dev->partial_data = (unsigned long) kmalloc(dev->hard_mtu, GFP_KERNEL);
+        if (!dev->partial_data)
+                return -ENOMEM;
+