[PATCH v2] USB: serial: option: add id for Motorola Solutions TETRA PEI

From: Max Schulze
Date: Fri Jan 12 2018 - 03:28:37 EST


Add Motorola Device ID and blacklist entry to the driver usb/serial/option

Signed-off-by: Max Schulze <max.schulze@xxxxxxxxx>
---
v2: reformatted Patch, first version was declined by GK-H's Bot

Thanks for the help, Johan!

To an URB setup request from the host
bmRequestType: 0x21
bRequest: 34
wValue: 0x0003
wIndex: 0 (0x0000)
wLength: 0

the device responds with
URB status: Broken pipe (-EPIPE) (-32)

So blacklisting to avoid the usb_wwan_send_setup in usb_wwan_dtr_rts of usb_wwan.
Tested now to work with miniterm.py and minicom without errors.

D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
P: Vendor=0cad ProdID=9011 Rev=24.16
S: Manufacturer=Motorola Solutions Inc.
S: Product=Motorola Solutions TETRA PEI interface
C: #Ifs= 2 Cfg#= 1 Atr=80 MxPwr=500mA
I: If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)

drivers/usb/serial/option.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index b6320e3be429..c8819a41d2df 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -686,6 +686,10 @@ static const struct option_blacklist_info yuga_clm920_nc5_blacklist = {
.reserved = BIT(1) | BIT(4),
};

+static const struct option_blacklist_info motorola_pei_blacklist = {
+ .sendsetup = BIT(0) | BIT(1),
+};
+
static const struct usb_device_id option_ids[] = {
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -2054,6 +2058,8 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(WETELECOM_VENDOR_ID, WETELECOM_PRODUCT_6802, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(WETELECOM_VENDOR_ID, WETELECOM_PRODUCT_WMD300, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x421d, 0xff, 0xff, 0xff) }, /* HP lt2523 (Novatel E371) */
+ { USB_DEVICE(0x0cad, 0x9011), /* Motorola Solutions TETRA PEI */
+ .driver_info = (kernel_ulong_t)&motorola_pei_blacklist },
{ } /* Terminating entry */
};
MODULE_DEVICE_TABLE(usb, option_ids);
--
2.15.1