Skip to contentSkip to conversation

qmi_wwan, cdc-ether: add ADU960S

PATCH Superseded Dan Williams 3 participants 5 messages Feb 6, 2013 – Feb 19, 2013 1 message not in the archive

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qmi_wwan, cdc-ether: add ADU960S

It advertises a standard CDC-ETHER interface, which actually should be driven by qmi_wwan.

---

drivers/net/usb/cdc_ether.c +7 -0
index 3f3d12d..cc6d0c1 100644
@@ -615,6 +615,13 @@ static const struct usb_device_id	products [] = {
 	.driver_info = 0,
 },
 
+/* AnyDATA ADU960S - handled by qmi_wwan */
+{
+	USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a, USB_CLASS_COMM,
+			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
+	.driver_info = 0,
+},
+
 /*
  * WHITELIST!!!
  *
drivers/net/usb/qmi_wwan.c +1 -0
index 6a1ca50..2b5ea32 100644
@@ -459,6 +459,7 @@ static const struct usb_device_id products[] = {
 	{QMI_FIXED_INTF(0x1199, 0x68a2, 19)},	/* Sierra Wireless MC7710 in QMI mode */
 	{QMI_FIXED_INTF(0x1199, 0x901c, 8)},    /* Sierra Wireless EM7700 */
 	{QMI_FIXED_INTF(0x1bbb, 0x011e, 4)},	/* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */
+	{QMI_FIXED_INTF(0x16d5, 0x650a, 8)},	/* AnyDATA ADU960S */
 
 	/* 4. Gobi 1000 devices */
 	{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},	/* Acer Gobi Modem Device */
maintainer
#1 lore raw
Quoted 28 lines · Dan Williams

It advertises a standard CDC-ETHER interface, which actually should be driven by qmi_wwan.

---

drivers/net/usb/cdc_ether.c +7 -0
index 3f3d12d..cc6d0c1 100644
@@ -615,6 +615,13 @@ static const struct usb_device_id	products [] = {
 	.driver_info = 0,
 },
 
+/* AnyDATA ADU960S - handled by qmi_wwan */
+{
+	USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a, USB_CLASS_COMM,
+			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
+	.driver_info = 0,
+},
+
 /*
  * WHITELIST!!!
  *
drivers/net/usb/qmi_wwan.c +0 -0
index 6a1ca50..2b5ea32 100644

drivers/net/usb/qmi_wwan.c static const struct usb_device_id products[] = { · line 465

Quoted 7 lines
drivers/net/usb/qmi_wwan.c +1 -0
@@ -459,6 +459,7 @@ static const struct usb_device_id products[] = {
 	{QMI_FIXED_INTF(0x1199, 0x68a2, 19)},	/* Sierra Wireless MC7710 in QMI mode */
 	{QMI_FIXED_INTF(0x1199, 0x901c, 8)},    /* Sierra Wireless EM7700 */
 	{QMI_FIXED_INTF(0x1bbb, 0x011e, 4)},	/* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */
+	{QMI_FIXED_INTF(0x16d5, 0x650a, 8)},	/* AnyDATA ADU960S */
 
 	/* 4. Gobi 1000 devices */
 	{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},	/* Acer Gobi Modem Device */

Just thinking....

Maybe we should use USB_DEVICE_AND_INTERFACE_INFO() in qmi_wwan as well for these devices? The only reason we match on interface number for most devices in that driver is because those devices use ff/ff/ff for multiple different functions. When the function is uniquely identified using class/subclass/protocol as here, then I believe it makes more sense to use those values. And it creates a symmetry between the cdc_ether and the qmi_wwan entries, making the connection between them clearer.

Not to mention that such symmetry prevents us from ending up with no driver supporting the device if some firmware upgrade happened to change the interface number..

Bjørn

#2 lore raw
Quoted 41 lines · Bjørn Mork
Quoted 28 lines · Dan Williams

It advertises a standard CDC-ETHER interface, which actually should be driven by qmi_wwan.

---

drivers/net/usb/cdc_ether.c +7 -0
index 3f3d12d..cc6d0c1 100644
@@ -615,6 +615,13 @@ static const struct usb_device_id	products [] = {
 	.driver_info = 0,
 },
 
+/* AnyDATA ADU960S - handled by qmi_wwan */
+{
+	USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a, USB_CLASS_COMM,
+			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
+	.driver_info = 0,
+},
+
 /*
  * WHITELIST!!!
  *
drivers/net/usb/qmi_wwan.c +0 -0
index 6a1ca50..2b5ea32 100644

drivers/net/usb/qmi_wwan.c static const struct usb_device_id products[] = { · line 465

Quoted 7 lines
drivers/net/usb/qmi_wwan.c +1 -0
@@ -459,6 +459,7 @@ static const struct usb_device_id products[] = {
 	{QMI_FIXED_INTF(0x1199, 0x68a2, 19)},	/* Sierra Wireless MC7710 in QMI mode */
 	{QMI_FIXED_INTF(0x1199, 0x901c, 8)},    /* Sierra Wireless EM7700 */
 	{QMI_FIXED_INTF(0x1bbb, 0x011e, 4)},	/* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */
+	{QMI_FIXED_INTF(0x16d5, 0x650a, 8)},	/* AnyDATA ADU960S */
 
 	/* 4. Gobi 1000 devices */
 	{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},	/* Acer Gobi Modem Device */

Just thinking....

Quoted 8 lines

Maybe we should use USB_DEVICE_AND_INTERFACE_INFO() in qmi_wwan as well for these devices? The only reason we match on interface number for most devices in that driver is because those devices use ff/ff/ff for multiple different functions. When the function is uniquely identified using class/subclass/protocol as here, then I believe it makes more sense to use those values. And it creates a symmetry between the cdc_ether and the qmi_wwan entries, making the connection between them clearer.

Ok, I'll resubmit with DEVICE_AND_INTERFACE_INFO in qmi_wwan.

Dan

Quoted 10 lines

Not to mention that such symmetry prevents us from ending up with no driver supporting the device if some firmware upgrade happened to change the interface number..

Bjørn
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw

PATCH v2 1/1 qmi_wwan, cdc-ether: add ADU960S

It advertises a standard CDC-ETHER interface, which actually should be driven by qmi_wwan.

---
index 3f3d12d..57136dc 100644

drivers/net/usb/cdc_ether.c +7 -0
@@ -615,6 +615,13 @@ static const struct usb_device_id	products [] = {
 	.driver_info = 0,
 },
 
+/* AnyDATA ADU960S - handled by qmi_wwan */
+{
+	USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a, USB_CLASS_COMM,
+			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
+	.driver_info = 0,
+},
+
 /*
  * WHITELIST!!!
  *
drivers/net/usb/qmi_wwan.c +7 -0
index 19d9035..efb5c7c 100644
@@ -409,6 +409,13 @@ static const struct usb_device_id products[] = {
 					      USB_CDC_PROTO_NONE),
 		.driver_info        = (unsigned long)&qmi_wwan_info,
 	},
+	{	/* ADU960S */
+		USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a,
+					      USB_CLASS_COMM,
+					      USB_CDC_SUBCLASS_ETHERNET,
+					      USB_CDC_PROTO_NONE),
+		.driver_info        = (unsigned long)&qmi_wwan_info,
+	},
 
 	/* 3. Combined interface devices matching on interface number */
 	{QMI_FIXED_INTF(0x0408, 0xea42, 4)},	/* Yota / Megafon M100-1 */

A message that is not in the archive (sent off-list or not yet received): 1361244309.29695.12.camel-wKZy7rqYPVb5EHUCmHmTqw@public.gmane.org