Always bind to control interface regardless of whether
it is a shared interface or not.
Most devices supported by this driver use a single
USB interface for both control and data. But some of
the supported devices split control and data into
two interfaces, bound together by a CDC Union descriptor
on the control interface. Before the cdc-wdm subdriver
support was added, this split was used to let cdc-wdm
drive the control interface and qmi_wwan drive the data
interface.
This does however require exact matching in the data
interface, and consistent device matching between
drivers matching on the control interface (cdc-wdm,
cdc-ether and others) and this driver. Some devices
use generic descriptors for the data interface, making
such matching unreliable at best.
Changing to control interface matching makes the driver
behave like users expect, and removes the need to add
some of the supported devices to both this driver and
cdc-wdm.
Signed-off-by: Bj=C3=B8rn Mork <bjorn-***@public.gmane.org>
---
drivers/net/usb/qmi_wwan.c | 242 ++++++++++++++++++++++++------------=
--------
1 file changed, 130 insertions(+), 112 deletions(-)
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 9c6631a..7765ad4 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -15,11 +15,7 @@
#include <linux/usb/usbnet.h>
#include <linux/usb/cdc-wdm.h>
=20
-/* The name of the CDC Device Management driver */
-#define DM_DRIVER "cdc_wdm"
-
-/*
- * This driver supports wwan (3G/LTE/?) devices using a vendor
+/* This driver supports wwan (3G/LTE/?) devices using a vendor
* specific management protocol called Qualcomm MSM Interface (QMI) -
* in addition to the more common AT commands over serial interface
* management
@@ -31,40 +27,95 @@
* management protocol is used in place of the standard CDC
* notifications NOTIFY_NETWORK_CONNECTION and NOTIFY_SPEED_CHANGE
*
+ * Alternatively, control and data functions can be combined in a
+ * single USB interface.
+ *
* Handling a protocol like QMI is out of the scope for any driver.
- * It can be exported as a character device using the cdc-wdm driver,
- * which will enable userspace applications ("modem managers") to
- * handle it. This may be required to use the network interface
- * provided by the driver.
+ * It is exported as a character device using the cdc-wdm driver as
+ * a subdriver, enabling userspace applications ("modem managers") to
+ * handle it.
*
* These devices may alternatively/additionally be configured using AT
- * commands on any of the serial interfaces driven by the option drive=
r
- *
- * This driver binds only to the data ("slave") interface to enable
- * the cdc-wdm driver to bind to the control interface. It still
- * parses the CDC functional descriptors on the control interface to
- * a) verify that this is indeed a handled interface (CDC Union
- * header lists it as slave)
- * b) get MAC address and other ethernet config from the CDC Ethernet
- * header
- * c) enable user bind requests against the control interface, which
- * is the common way to bind to CDC Ethernet Control Model type
- * interfaces
- * d) provide a hint to the user about which interface is the
- * corresponding management interface
+ * commands on a serial interface
*/
=20
/* driver specific data */
struct qmi_wwan_state {
struct usb_driver *subdriver;
atomic_t pmcount;
- unsigned long unused[3];
+ unsigned long unused;
+ struct usb_interface *control;
+ struct usb_interface *data;
};
=20
+/* using a counter to merge subdriver requests with our own into a com=
bined state */
+static int qmi_wwan_manage_power(struct usbnet *dev, int on)
+{
+ struct qmi_wwan_state *info =3D (void *)&dev->data;
+ int rv =3D 0;
+
+ dev_dbg(&dev->intf->dev, "%s() pmcount=3D%d, on=3D%d\n", __func__, at=
omic_read(&info->pmcount), on);
+
+ if ((on && atomic_add_return(1, &info->pmcount) =3D=3D 1) || (!on && =
atomic_dec_and_test(&info->pmcount))) {
+ /* need autopm_get/put here to ensure the usbcore sees the new value=
*/
+ rv =3D usb_autopm_get_interface(dev->intf);
+ if (rv < 0)
+ goto err;
+ dev->intf->needs_remote_wakeup =3D on;
+ usb_autopm_put_interface(dev->intf);
+ }
+err:
+ return rv;
+}
+
+static int qmi_wwan_cdc_wdm_manage_power(struct usb_interface *intf, i=
nt on)
+{
+ struct usbnet *dev =3D usb_get_intfdata(intf);
+ return qmi_wwan_manage_power(dev, on);
+}
+
+/* collect all three endpoints and register subdriver */
+static int qmi_wwan_register_subdriver(struct usbnet *dev)
+{
+ int rv;
+ struct qmi_wwan_state *info =3D (void *)&dev->data;
+
+ /* collect bulk endpoints */
+ rv =3D usbnet_get_endpoints(dev, info->data);
+ if (rv < 0)
+ goto err;
+
+ /* update status endpoint if separate control interface */
+ if (info->control !=3D info->data)
+ dev->status =3D &info->control->cur_altsetting->endpoint[0];
+
+ /* require interrupt endpoint for subdriver */
+ if (!dev->status) {
+ rv =3D -EINVAL;
+ goto err;
+ }
+
+ /* for subdriver power management */
+ atomic_set(&info->pmcount, 0);
+
+ /* register subdriver */
+ info->subdriver =3D usb_cdc_wdm_register(info->control, &dev->status-=
desc, 512, &qmi_wwan_cdc_wdm_manage_power);
+ if (IS_ERR(info->subdriver)) {
+ dev_err(&info->control->dev, "subdriver registration failed\n");
+ rv =3D PTR_ERR(info->subdriver);
+ info->subdriver =3D NULL;
+ goto err;
+ }
+
+ /* prevent usbnet from using status endpoint */
+ dev->status =3D NULL;
+err:
+ return rv;
+}
+
static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *int=
f)
{
int status =3D -1;
- struct usb_interface *control =3D NULL;
u8 *buf =3D intf->cur_altsetting->extra;
int len =3D intf->cur_altsetting->extralen;
struct usb_interface_descriptor *desc =3D &intf->cur_altsetting->desc=
;
@@ -72,27 +123,14 @@ static int qmi_wwan_bind(struct usbnet *dev, struc=
t usb_interface *intf)
struct usb_cdc_ether_desc *cdc_ether =3D NULL;
u32 required =3D 1 << USB_CDC_HEADER_TYPE | 1 << USB_CDC_UNION_TYPE;
u32 found =3D 0;
+ struct usb_driver *driver =3D driver_of(intf);
struct qmi_wwan_state *info =3D (void *)&dev->data;
=20
BUILD_BUG_ON((sizeof(((struct usbnet *)0)->data) < sizeof(struct qmi_=
wwan_state)));
=20
- atomic_set(&info->pmcount, 0);
-
- /*
- * assume a data interface has no additional descriptors and
- * that the control and data interface are numbered
- * consecutively - this holds for the Huawei device at least
- */
- if (len =3D=3D 0 && desc->bInterfaceNumber > 0) {
- control =3D usb_ifnum_to_if(dev->udev, desc->bInterfaceNumber - 1);
- if (!control)
- goto err;
-
- buf =3D control->cur_altsetting->extra;
- len =3D control->cur_altsetting->extralen;
- dev_dbg(&intf->dev, "guessing \"control\" =3D> %s, \"data\" =3D> thi=
s\n",
- dev_name(&control->dev));
- }
+ /* require a single interrupt status endpoint for subdriver */
+ if (intf->cur_altsetting->desc.bNumEndpoints !=3D 1)
+ goto err;
=20
while (len > 3) {
struct usb_descriptor_header *h =3D (void *)buf;
@@ -156,10 +194,17 @@ next_desc:
goto err;
}
=20
- /* give the user a helpful hint if trying to bind to the wrong interf=
ace */
- if (cdc_union && desc->bInterfaceNumber =3D=3D cdc_union->bMasterInte=
rface0) {
- dev_err(&intf->dev, "leaving \"control\" interface for " DM_DRIVER "=
- try binding to %s instead!\n",
- dev_name(&usb_ifnum_to_if(dev->udev, cdc_union->bSlaveInterface0)->=
dev));
+ /* verify CDC Union */
+ if (desc->bInterfaceNumber !=3D cdc_union->bMasterInterface0) {
+ dev_err(&intf->dev, "bogus CDC Union: master=3D%u\n", cdc_union->bMa=
sterInterface0);
+ goto err;
+ }
+
+ /* need to save these for unbind */
+ info->control =3D intf;
+ info->data =3D usb_ifnum_to_if(dev->udev, cdc_union->bSlaveInterface0=
);
+ if (!info->data) {
+ dev_err(&intf->dev, "bogus CDC Union: slave=3D%u\n", cdc_union->bSla=
veInterface0);
goto err;
}
=20
@@ -169,46 +214,21 @@ next_desc:
usbnet_get_ethernet_addr(dev, cdc_ether->iMACAddress);
}
=20
- /* success! point the user to the management interface */
- if (control)
- dev_info(&intf->dev, "Use \"" DM_DRIVER "\" for QMI interface %s\n",
- dev_name(&control->dev));
-
- /* XXX: add a sysfs symlink somewhere to help management applications=
find it? */
+ /* claim data interface and set it up */
+ status =3D usb_driver_claim_interface(driver, info->data, dev);
+ if (status < 0)
+ goto err;
=20
- /* collect bulk endpoints now that we know intf =3D=3D "data" interfa=
ce */
- status =3D usbnet_get_endpoints(dev, intf);
+ status =3D qmi_wwan_register_subdriver(dev);
+ if (status < 0) {
+ usb_set_intfdata(info->data, NULL);
+ usb_driver_release_interface(driver, info->data);
+ }
=20
err:
return status;
}
=20
-/* using a counter to merge subdriver requests with our own into a com=
bined state */
-static int qmi_wwan_manage_power(struct usbnet *dev, int on)
-{
- struct qmi_wwan_state *info =3D (void *)&dev->data;
- int rv =3D 0;
-
- dev_dbg(&dev->intf->dev, "%s() pmcount=3D%d, on=3D%d\n", __func__, at=
omic_read(&info->pmcount), on);
-
- if ((on && atomic_add_return(1, &info->pmcount) =3D=3D 1) || (!on && =
atomic_dec_and_test(&info->pmcount))) {
- /* need autopm_get/put here to ensure the usbcore sees the new value=
*/
- rv =3D usb_autopm_get_interface(dev->intf);
- if (rv < 0)
- goto err;
- dev->intf->needs_remote_wakeup =3D on;
- usb_autopm_put_interface(dev->intf);
- }
-err:
- return rv;
-}
-
-static int qmi_wwan_cdc_wdm_manage_power(struct usb_interface *intf, i=
nt on)
-{
- struct usbnet *dev =3D usb_get_intfdata(intf);
- return qmi_wwan_manage_power(dev, on);
-}
-
/* Some devices combine the "control" and "data" functions into a
* single interface with all three endpoints: interrupt + bulk in and
* out
@@ -236,29 +256,10 @@ static int qmi_wwan_bind_shared(struct usbnet *de=
v, struct usb_interface *intf)
goto err;
}
=20
- atomic_set(&info->pmcount, 0);
-
- /* collect all three endpoints */
- rv =3D usbnet_get_endpoints(dev, intf);
- if (rv < 0)
- goto err;
-
- /* require interrupt endpoint for subdriver */
- if (!dev->status) {
- rv =3D -EINVAL;
- goto err;
- }
-
- info->subdriver =3D usb_cdc_wdm_register(intf, &dev->status->desc, 51=
2, &qmi_wwan_cdc_wdm_manage_power);
- if (IS_ERR(info->subdriver)) {
- rv =3D PTR_ERR(info->subdriver);
- info->subdriver =3D NULL;
- goto err;
- }
-
- /* can't let usbnet use the interrupt endpoint */
- dev->status =3D NULL;
-
+ /* control and data is shared */
+ info->control =3D intf;
+ info->data =3D intf;
+ rv =3D qmi_wwan_register_subdriver(dev);
err:
return rv;
}
@@ -286,14 +287,30 @@ err:
return rv;
}
=20
-static void qmi_wwan_unbind_shared(struct usbnet *dev, struct usb_inte=
rface *intf)
+static void qmi_wwan_unbind(struct usbnet *dev, struct usb_interface *=
intf)
{
struct qmi_wwan_state *info =3D (void *)&dev->data;
+ struct usb_driver *driver =3D driver_of(intf);
+ struct usb_interface *other;
=20
if (info->subdriver && info->subdriver->disconnect)
- info->subdriver->disconnect(intf);
+ info->subdriver->disconnect(info->control);
+
+ /* allow user to unbind using either control or data */
+ if (intf =3D=3D info->control)
+ other =3D info->data;
+ else
+ other =3D info->control;
+
+ /* only if not shared */
+ if (other && intf !=3D other) {
+ usb_set_intfdata(other, NULL);
+ usb_driver_release_interface(driver, other);
+ }
=20
info->subdriver =3D NULL;
+ info->data =3D NULL;
+ info->control =3D NULL;
}
=20
/* suspend/resume wrappers calling both usbnet and the cdc-wdm
@@ -342,6 +359,7 @@ static const struct driver_info qmi_wwan_info =3D {
.description =3D "QMI speaking wwan device",
.flags =3D FLAG_WWAN,
.bind =3D qmi_wwan_bind,
+ .unbind =3D qmi_wwan_unbind,
.manage_power =3D qmi_wwan_manage_power,
};
=20
@@ -349,7 +367,7 @@ static const struct driver_info qmi_wwan_shared =3D=
{
.description =3D "QMI speaking wwan device with combined interface",
.flags =3D FLAG_WWAN,
.bind =3D qmi_wwan_bind_shared,
- .unbind =3D qmi_wwan_unbind_shared,
+ .unbind =3D qmi_wwan_unbind,
.manage_power =3D qmi_wwan_manage_power,
};
=20
@@ -357,7 +375,7 @@ static const struct driver_info qmi_wwan_gobi =3D {
.description =3D "Qualcomm Gobi wwan/QMI device",
.flags =3D FLAG_WWAN,
.bind =3D qmi_wwan_bind_gobi,
- .unbind =3D qmi_wwan_unbind_shared,
+ .unbind =3D qmi_wwan_unbind,
.manage_power =3D qmi_wwan_manage_power,
};
=20
@@ -366,7 +384,7 @@ static const struct driver_info qmi_wwan_force_int1=
=3D {
.description =3D "Qualcomm WWAN/QMI device",
.flags =3D FLAG_WWAN,
.bind =3D qmi_wwan_bind_shared,
- .unbind =3D qmi_wwan_unbind_shared,
+ .unbind =3D qmi_wwan_unbind,
.manage_power =3D qmi_wwan_manage_power,
.data =3D BIT(1), /* interface whitelist bitmap */
};
@@ -375,7 +393,7 @@ static const struct driver_info qmi_wwan_force_int4=
=3D {
.description =3D "Qualcomm WWAN/QMI device",
.flags =3D FLAG_WWAN,
.bind =3D qmi_wwan_bind_shared,
- .unbind =3D qmi_wwan_unbind_shared,
+ .unbind =3D qmi_wwan_unbind,
.manage_power =3D qmi_wwan_manage_power,
.data =3D BIT(4), /* interface whitelist bitmap */
};
@@ -397,7 +415,7 @@ static const struct driver_info qmi_wwan_sierra =3D=
{
.description =3D "Sierra Wireless wwan/QMI device",
.flags =3D FLAG_WWAN,
.bind =3D qmi_wwan_bind_gobi,
- .unbind =3D qmi_wwan_unbind_shared,
+ .unbind =3D qmi_wwan_unbind,
.manage_power =3D qmi_wwan_manage_power,
.data =3D BIT(8) | BIT(19), /* interface whitelist bitmap */
};
@@ -413,7 +431,7 @@ static const struct usb_device_id products[] =3D {
.idVendor =3D HUAWEI_VENDOR_ID,
.bInterfaceClass =3D USB_CLASS_VENDOR_SPEC,
.bInterfaceSubClass =3D 1,
- .bInterfaceProtocol =3D 8, /* NOTE: This is the *slave* interface of=
the CDC Union! */
+ .bInterfaceProtocol =3D 9, /* CDC Ethernet *control* interface */
.driver_info =3D (unsigned long)&qmi_wwan_info,
},
{ /* Vodafone/Huawei K5005 (12d1:14c8) and similar modems */
@@ -421,7 +439,7 @@ static const struct usb_device_id products[] =3D {
.idVendor =3D HUAWEI_VENDOR_ID,
.bInterfaceClass =3D USB_CLASS_VENDOR_SPEC,
.bInterfaceSubClass =3D 1,
- .bInterfaceProtocol =3D 56, /* NOTE: This is the *slave* interface o=
f the CDC Union! */
+ .bInterfaceProtocol =3D 57, /* XXX: verify this! */
.driver_info =3D (unsigned long)&qmi_wwan_info,
},
{ /* Huawei E392, E398 and possibly others in "Windows mode"
--=20
1.7.10
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-***@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html