|
|
@@ -0,0 +1,313 @@
|
|
|
+diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
|
|
|
+index e325ca3..a880200 100644
|
|
|
+--- a/drivers/net/usb/qmi_wwan.c
|
|
|
++++ b/drivers/net/usb/qmi_wwan.c
|
|
|
+@@ -14,7 +14,9 @@
|
|
|
+ #include <linux/netdevice.h>
|
|
|
+ #include <linux/ethtool.h>
|
|
|
+ #include <linux/etherdevice.h>
|
|
|
++#include <linux/if_arp.h>
|
|
|
+ #include <linux/mii.h>
|
|
|
++#include <linux/rtnetlink.h>
|
|
|
+ #include <linux/usb.h>
|
|
|
+ #include <linux/usb/cdc.h>
|
|
|
+ #include <linux/usb/usbnet.h>
|
|
|
+@@ -48,11 +50,104 @@
|
|
|
+ struct qmi_wwan_state {
|
|
|
+ struct usb_driver *subdriver;
|
|
|
+ atomic_t pmcount;
|
|
|
+- unsigned long unused;
|
|
|
++ unsigned long flags;
|
|
|
+ struct usb_interface *control;
|
|
|
+ struct usb_interface *data;
|
|
|
+ };
|
|
|
+
|
|
|
++enum qmi_wwan_flags {
|
|
|
++ QMI_WWAN_FLAG_RAWIP = 1 << 0,
|
|
|
++};
|
|
|
++
|
|
|
++enum qmi_wwan_quirks {
|
|
|
++ QMI_WWAN_QUIRK_DTR = 1 << 0, /* needs "set DTR" request */
|
|
|
++};
|
|
|
++
|
|
|
++static void qmi_wwan_netdev_setup(struct net_device *net)
|
|
|
++{
|
|
|
++ struct usbnet *dev = netdev_priv(net);
|
|
|
++ struct qmi_wwan_state *info = (void *)&dev->data;
|
|
|
++
|
|
|
++ if (info->flags & QMI_WWAN_FLAG_RAWIP) {
|
|
|
++ net->header_ops = NULL; /* No header */
|
|
|
++ net->type = ARPHRD_NONE;
|
|
|
++ net->hard_header_len = 0;
|
|
|
++ net->addr_len = 0;
|
|
|
++ net->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
|
|
|
++ netdev_dbg(net, "mode: raw IP\n");
|
|
|
++ } else if (!net->header_ops) { /* don't bother if already set */
|
|
|
++ ether_setup(net);
|
|
|
++ netdev_dbg(net, "mode: Ethernet\n");
|
|
|
++ }
|
|
|
++
|
|
|
++ /* recalculate buffers after changing hard_header_len */
|
|
|
++ usbnet_change_mtu(net, net->mtu);
|
|
|
++}
|
|
|
++
|
|
|
++static ssize_t raw_ip_show(struct device *d, struct device_attribute *attr, char *buf)
|
|
|
++{
|
|
|
++ struct usbnet *dev = netdev_priv(to_net_dev(d));
|
|
|
++ struct qmi_wwan_state *info = (void *)&dev->data;
|
|
|
++
|
|
|
++ return sprintf(buf, "%c\n", info->flags & QMI_WWAN_FLAG_RAWIP ? 'Y' : 'N');
|
|
|
++}
|
|
|
++
|
|
|
++static ssize_t raw_ip_store(struct device *d, struct device_attribute *attr, const char *buf, size_t len)
|
|
|
++{
|
|
|
++ struct usbnet *dev = netdev_priv(to_net_dev(d));
|
|
|
++ struct qmi_wwan_state *info = (void *)&dev->data;
|
|
|
++ bool enable;
|
|
|
++ int ret;
|
|
|
++
|
|
|
++ if (strtobool(buf, &enable))
|
|
|
++ return -EINVAL;
|
|
|
++
|
|
|
++ /* no change? */
|
|
|
++ if (enable == (info->flags & QMI_WWAN_FLAG_RAWIP))
|
|
|
++ return len;
|
|
|
++
|
|
|
++ if (!rtnl_trylock())
|
|
|
++ return restart_syscall();
|
|
|
++
|
|
|
++ /* we don't want to modify a running netdev */
|
|
|
++ if (netif_running(dev->net)) {
|
|
|
++ netdev_err(dev->net, "Cannot change a running device\n");
|
|
|
++ ret = -EBUSY;
|
|
|
++ goto err;
|
|
|
++ }
|
|
|
++
|
|
|
++ /* let other drivers deny the change */
|
|
|
++ ret = call_netdevice_notifiers(NETDEV_PRE_TYPE_CHANGE, dev->net);
|
|
|
++ ret = notifier_to_errno(ret);
|
|
|
++ if (ret) {
|
|
|
++ netdev_err(dev->net, "Type change was refused\n");
|
|
|
++ goto err;
|
|
|
++ }
|
|
|
++
|
|
|
++ if (enable)
|
|
|
++ info->flags |= QMI_WWAN_FLAG_RAWIP;
|
|
|
++ else
|
|
|
++ info->flags &= ~QMI_WWAN_FLAG_RAWIP;
|
|
|
++ qmi_wwan_netdev_setup(dev->net);
|
|
|
++ call_netdevice_notifiers(NETDEV_POST_TYPE_CHANGE, dev->net);
|
|
|
++ ret = len;
|
|
|
++err:
|
|
|
++ rtnl_unlock();
|
|
|
++ return ret;
|
|
|
++}
|
|
|
++
|
|
|
++static DEVICE_ATTR_RW(raw_ip);
|
|
|
++
|
|
|
++static struct attribute *qmi_wwan_sysfs_attrs[] = {
|
|
|
++ &dev_attr_raw_ip.attr,
|
|
|
++ NULL,
|
|
|
++};
|
|
|
++
|
|
|
++static struct attribute_group qmi_wwan_sysfs_attr_group = {
|
|
|
++ .name = "qmi",
|
|
|
++ .attrs = qmi_wwan_sysfs_attrs,
|
|
|
++};
|
|
|
++
|
|
|
+ /* default ethernet address used by the modem */
|
|
|
+ static const u8 default_modem_addr[ETH_ALEN] = {0x02, 0x50, 0xf3};
|
|
|
+
|
|
|
+@@ -80,6 +175,8 @@ static const u8 buggy_fw_addr[ETH_ALEN] = {0x00, 0xa0, 0xc6, 0x00, 0x00, 0x00};
|
|
|
+ */
|
|
|
+ static int qmi_wwan_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
|
|
|
+ {
|
|
|
++ struct qmi_wwan_state *info = (void *)&dev->data;
|
|
|
++ bool rawip = info->flags & QMI_WWAN_FLAG_RAWIP;
|
|
|
+ __be16 proto;
|
|
|
+
|
|
|
+ /* This check is no longer done by usbnet */
|
|
|
+@@ -94,15 +191,25 @@ static int qmi_wwan_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
|
|
|
+ proto = htons(ETH_P_IPV6);
|
|
|
+ break;
|
|
|
+ case 0x00:
|
|
|
++ if (rawip)
|
|
|
++ return 0;
|
|
|
+ if (is_multicast_ether_addr(skb->data))
|
|
|
+ return 1;
|
|
|
+ /* possibly bogus destination - rewrite just in case */
|
|
|
+ skb_reset_mac_header(skb);
|
|
|
+ goto fix_dest;
|
|
|
+ default:
|
|
|
++ if (rawip)
|
|
|
++ return 0;
|
|
|
+ /* pass along other packets without modifications */
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
++ if (rawip) {
|
|
|
++ skb->dev = dev->net; /* normally set by eth_type_trans */
|
|
|
++ skb->protocol = proto;
|
|
|
++ return 1;
|
|
|
++ }
|
|
|
++
|
|
|
+ if (skb_headroom(skb) < ETH_HLEN)
|
|
|
+ return 0;
|
|
|
+ skb_push(skb, ETH_HLEN);
|
|
|
+@@ -223,6 +330,20 @@ err:
|
|
|
+ return rv;
|
|
|
+ }
|
|
|
+
|
|
|
++/* Send CDC SetControlLineState request, setting or clearing the DTR.
|
|
|
++ * "Required for Autoconnect and 9x30 to wake up" according to the
|
|
|
++ * GobiNet driver. The requirement has been verified on an MDM9230
|
|
|
++ * based Sierra Wireless MC7455
|
|
|
++ */
|
|
|
++static int qmi_wwan_change_dtr(struct usbnet *dev, bool on)
|
|
|
++{
|
|
|
++ u8 intf = dev->intf->cur_altsetting->desc.bInterfaceNumber;
|
|
|
++
|
|
|
++ return usbnet_write_cmd(dev, USB_CDC_REQ_SET_CONTROL_LINE_STATE,
|
|
|
++ USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
|
|
|
++ on ? 0x01 : 0x00, intf, NULL, 0);
|
|
|
++}
|
|
|
++
|
|
|
+ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf)
|
|
|
+ {
|
|
|
+ int status = -1;
|
|
|
+@@ -257,7 +378,10 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf)
|
|
|
+ "bogus CDC Union: master=%u, slave=%u\n",
|
|
|
+ cdc_union->bMasterInterface0,
|
|
|
+ cdc_union->bSlaveInterface0);
|
|
|
+- goto err;
|
|
|
++
|
|
|
++ /* ignore and continue... */
|
|
|
++ cdc_union = NULL;
|
|
|
++ info->data = intf;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+@@ -280,6 +404,29 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf)
|
|
|
+ usb_driver_release_interface(driver, info->data);
|
|
|
+ }
|
|
|
+
|
|
|
++ /* disabling remote wakeup on MDM9x30 devices has the same
|
|
|
++ * effect as clearing DTR. The device will not respond to QMI
|
|
|
++ * requests until we set DTR again. This is similar to a
|
|
|
++ * QMI_CTL SYNC request, clearing a lot of firmware state
|
|
|
++ * including the client ID allocations.
|
|
|
++ *
|
|
|
++ * Our usage model allows a session to span multiple
|
|
|
++ * open/close events, so we must prevent the firmware from
|
|
|
++ * clearing out state the clients might need.
|
|
|
++ *
|
|
|
++ * MDM9x30 is the first QMI chipset with USB3 support. Abuse
|
|
|
++ * this fact to enable the quirk for all USB3 devices.
|
|
|
++ *
|
|
|
++ * There are also chipsets with the same "set DTR" requirement
|
|
|
++ * but without USB3 support. Devices based on these chips
|
|
|
++ * need a quirk flag in the device ID table.
|
|
|
++ */
|
|
|
++ if (dev->driver_info->data & QMI_WWAN_QUIRK_DTR ||
|
|
|
++ le16_to_cpu(dev->udev->descriptor.bcdUSB) >= 0x0201) {
|
|
|
++ qmi_wwan_manage_power(dev, 1);
|
|
|
++ qmi_wwan_change_dtr(dev, true);
|
|
|
++ }
|
|
|
++
|
|
|
+ /* Never use the same address on both ends of the link, even if the
|
|
|
+ * buggy firmware told us to. Or, if device is assigned the well-known
|
|
|
+ * buggy firmware MAC address, replace it with a random address,
|
|
|
+@@ -294,6 +441,7 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf)
|
|
|
+ dev->net->dev_addr[0] &= 0xbf; /* clear "IP" bit */
|
|
|
+ }
|
|
|
+ dev->net->netdev_ops = &qmi_wwan_netdev_ops;
|
|
|
++ dev->net->sysfs_groups[0] = &qmi_wwan_sysfs_attr_group;
|
|
|
+ err:
|
|
|
+ return status;
|
|
|
+ }
|
|
|
+@@ -307,6 +455,12 @@ static void qmi_wwan_unbind(struct usbnet *dev, struct usb_interface *intf)
|
|
|
+ if (info->subdriver && info->subdriver->disconnect)
|
|
|
+ info->subdriver->disconnect(info->control);
|
|
|
+
|
|
|
++ /* disable MDM9x30 quirk */
|
|
|
++ if (le16_to_cpu(dev->udev->descriptor.bcdUSB) >= 0x0201) {
|
|
|
++ qmi_wwan_change_dtr(dev, false);
|
|
|
++ qmi_wwan_manage_power(dev, 0);
|
|
|
++ }
|
|
|
++
|
|
|
+ /* allow user to unbind using either control or data */
|
|
|
+ if (intf == info->control)
|
|
|
+ other = info->data;
|
|
|
+@@ -381,6 +535,16 @@ static const struct driver_info qmi_wwan_info = {
|
|
|
+ .rx_fixup = qmi_wwan_rx_fixup,
|
|
|
+ };
|
|
|
+
|
|
|
++static const struct driver_info qmi_wwan_info_quirk_dtr = {
|
|
|
++ .description = "WWAN/QMI device",
|
|
|
++ .flags = FLAG_WWAN,
|
|
|
++ .bind = qmi_wwan_bind,
|
|
|
++ .unbind = qmi_wwan_unbind,
|
|
|
++ .manage_power = qmi_wwan_manage_power,
|
|
|
++ .rx_fixup = qmi_wwan_rx_fixup,
|
|
|
++ .data = QMI_WWAN_QUIRK_DTR,
|
|
|
++};
|
|
|
++
|
|
|
+ #define HUAWEI_VENDOR_ID 0x12D1
|
|
|
+
|
|
|
+ /* map QMI/wwan function by a fixed interface number */
|
|
|
+@@ -388,6 +552,11 @@ static const struct driver_info qmi_wwan_info = {
|
|
|
+ USB_DEVICE_INTERFACE_NUMBER(vend, prod, num), \
|
|
|
+ .driver_info = (unsigned long)&qmi_wwan_info
|
|
|
+
|
|
|
++/* devices requiring "set DTR" quirk */
|
|
|
++#define QMI_QUIRK_SET_DTR(vend, prod, num) \
|
|
|
++ USB_DEVICE_INTERFACE_NUMBER(vend, prod, num), \
|
|
|
++ .driver_info = (unsigned long)&qmi_wwan_info_quirk_dtr
|
|
|
++
|
|
|
+ /* Gobi 1000 QMI/wwan interface number is 3 according to qcserial */
|
|
|
+ #define QMI_GOBI1K_DEVICE(vend, prod) \
|
|
|
+ QMI_FIXED_INTF(vend, prod, 3)
|
|
|
+@@ -725,8 +894,6 @@ static const struct usb_device_id products[] = {
|
|
|
+ {QMI_FIXED_INTF(0x1199, 0x9056, 8)}, /* Sierra Wireless Modem */
|
|
|
+ {QMI_FIXED_INTF(0x1199, 0x9057, 8)},
|
|
|
+ {QMI_FIXED_INTF(0x1199, 0x9061, 8)}, /* Sierra Wireless Modem */
|
|
|
+- {QMI_FIXED_INTF(0x1199, 0x9070, 8)}, /* Sierra Wireless MC74xx/EM74xx */
|
|
|
+- {QMI_FIXED_INTF(0x1199, 0x9070, 10)}, /* Sierra Wireless MC74xx/EM74xx */
|
|
|
+ {QMI_FIXED_INTF(0x1199, 0x9071, 8)}, /* Sierra Wireless MC74xx */
|
|
|
+ {QMI_FIXED_INTF(0x1199, 0x9071, 10)}, /* Sierra Wireless MC74xx */
|
|
|
+ {QMI_FIXED_INTF(0x1199, 0x9079, 8)}, /* Sierra Wireless EM74xx */
|
|
|
+@@ -737,6 +904,7 @@ static const struct usb_device_id products[] = {
|
|
|
+ {QMI_FIXED_INTF(0x1bbb, 0x0203, 2)}, /* Alcatel L800MA */
|
|
|
+ {QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */
|
|
|
+ {QMI_FIXED_INTF(0x2357, 0x9000, 4)}, /* TP-LINK MA260 */
|
|
|
++ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1040, 2)}, /* Telit LE922A */
|
|
|
+ {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */
|
|
|
+ {QMI_FIXED_INTF(0x1bc7, 0x1201, 2)}, /* Telit LE920 */
|
|
|
+ {QMI_FIXED_INTF(0x1c9e, 0x9b01, 3)}, /* XS Stick W100-2 from 4G Systems */
|
|
|
+@@ -749,15 +917,21 @@ static const struct usb_device_id products[] = {
|
|
|
+ {QMI_FIXED_INTF(0x0b3c, 0xc00b, 4)}, /* Olivetti Olicard 500 */
|
|
|
+ {QMI_FIXED_INTF(0x1e2d, 0x0060, 4)}, /* Cinterion PLxx */
|
|
|
+ {QMI_FIXED_INTF(0x1e2d, 0x0053, 4)}, /* Cinterion PHxx,PXxx */
|
|
|
++ {QMI_FIXED_INTF(0x1e2d, 0x0082, 4)}, /* Cinterion PHxx,PXxx (2 RmNet) */
|
|
|
++ {QMI_FIXED_INTF(0x1e2d, 0x0082, 5)}, /* Cinterion PHxx,PXxx (2 RmNet) */
|
|
|
++ {QMI_FIXED_INTF(0x1e2d, 0x0083, 4)}, /* Cinterion PHxx,PXxx (1 RmNet + USB Audio)*/
|
|
|
+ {QMI_FIXED_INTF(0x413c, 0x81a2, 8)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */
|
|
|
+ {QMI_FIXED_INTF(0x413c, 0x81a3, 8)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */
|
|
|
+ {QMI_FIXED_INTF(0x413c, 0x81a4, 8)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */
|
|
|
+ {QMI_FIXED_INTF(0x413c, 0x81a8, 8)}, /* Dell Wireless 5808 Gobi(TM) 4G LTE Mobile Broadband Card */
|
|
|
+ {QMI_FIXED_INTF(0x413c, 0x81a9, 8)}, /* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */
|
|
|
+ {QMI_FIXED_INTF(0x413c, 0x81b1, 8)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card */
|
|
|
++ {QMI_FIXED_INTF(0x413c, 0x81b3, 8)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */
|
|
|
+ {QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)}, /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */
|
|
|
+ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */
|
|
|
+- {QMI_FIXED_INTF(0x1e0e, 0x9001, 5)}, /* SIMCom 7230E */
|
|
|
++ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7230E */
|
|
|
++ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0125, 4)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */
|
|
|
++ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */
|
|
|
+
|
|
|
+ /* 4. Gobi 1000 devices */
|
|
|
+ {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
|
|
|
+@@ -875,3 +1049,4 @@ module_usb_driver(qmi_wwan_driver);
|
|
|
+ MODULE_AUTHOR("Bjørn Mork <bjorn@mork.no>");
|
|
|
+ MODULE_DESCRIPTION("Qualcomm MSM Interface (QMI) WWAN driver");
|
|
|
+ MODULE_LICENSE("GPL");
|
|
|
++
|
