| Message ID | 20191206153732.2451-1-dnlplm@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [V2,1/1] usb: serial: option: add ZLP support for 0x1bc7/0x9010 | expand |
On Fri, Dec 06, 2019 at 04:37:32PM +0100, Daniele Palmas wrote: > Telit FN980 flashing device 0x1bc7/0x9010 requires zero packet > to be sent if out data size is equal to the endpoint max size. > > Signed-off-by: Daniele Palmas <dnlplm@gmail.com> > --- > V2: removed transfer_length calculations > diff --git a/drivers/usb/serial/usb-wwan.h b/drivers/usb/serial/usb-wwan.h > index 1c120eaf4091..934e9361cf6b 100644 > --- a/drivers/usb/serial/usb-wwan.h > +++ b/drivers/usb/serial/usb-wwan.h > @@ -38,6 +38,7 @@ struct usb_wwan_intf_private { > spinlock_t susp_lock; > unsigned int suspended:1; > unsigned int use_send_setup:1; > + unsigned int use_zlp:1; > int in_flight; > unsigned int open_ports; > void *private; > diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c > index 7e855c87e4f7..5e5a284a4ba3 100644 > --- a/drivers/usb/serial/usb_wwan.c > +++ b/drivers/usb/serial/usb_wwan.c > @@ -228,6 +228,8 @@ int usb_wwan_write(struct tty_struct *tty, struct usb_serial_port *port, > } else { > intfdata->in_flight++; > spin_unlock_irqrestore(&intfdata->susp_lock, flags); > + if (intfdata->use_zlp) > + this_urb->transfer_flags |= URB_ZERO_PACKET; Just set it once when allocating the URBs at port_probe. > err = usb_submit_urb(this_urb, GFP_ATOMIC); > if (err) { > dev_err(&port->dev, Johan
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 06ab016be0b6..f74277c64dbc 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -566,6 +566,9 @@ static void option_instat_callback(struct urb *urb); /* Interface must have two endpoints */ #define NUMEP2 BIT(16) +/* Device needs ZLP */ +#define ZLP BIT(17) + static const struct usb_device_id option_ids[] = { { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, @@ -1193,6 +1196,8 @@ static const struct usb_device_id option_ids[] = { .driver_info = NCTRL(0) | RSVD(1) }, { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff), /* Telit LN940 (MBIM) */ .driver_info = NCTRL(0) }, + { USB_DEVICE(TELIT_VENDOR_ID, 0x9010), /* Telit SBL FN980 flashing device */ + .driver_info = NCTRL(0) | ZLP }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff), .driver_info = RSVD(1) }, @@ -2090,6 +2095,9 @@ static int option_attach(struct usb_serial *serial) if (!(device_flags & NCTRL(iface_desc->bInterfaceNumber))) data->use_send_setup = 1; + if (device_flags & ZLP) + data->use_zlp = 1; + spin_lock_init(&data->susp_lock); usb_set_serial_data(serial, data); diff --git a/drivers/usb/serial/usb-wwan.h b/drivers/usb/serial/usb-wwan.h index 1c120eaf4091..934e9361cf6b 100644 --- a/drivers/usb/serial/usb-wwan.h +++ b/drivers/usb/serial/usb-wwan.h @@ -38,6 +38,7 @@ struct usb_wwan_intf_private { spinlock_t susp_lock; unsigned int suspended:1; unsigned int use_send_setup:1; + unsigned int use_zlp:1; int in_flight; unsigned int open_ports; void *private; diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c index 7e855c87e4f7..5e5a284a4ba3 100644 --- a/drivers/usb/serial/usb_wwan.c +++ b/drivers/usb/serial/usb_wwan.c @@ -228,6 +228,8 @@ int usb_wwan_write(struct tty_struct *tty, struct usb_serial_port *port, } else { intfdata->in_flight++; spin_unlock_irqrestore(&intfdata->susp_lock, flags); + if (intfdata->use_zlp) + this_urb->transfer_flags |= URB_ZERO_PACKET; err = usb_submit_urb(this_urb, GFP_ATOMIC); if (err) { dev_err(&port->dev,
Telit FN980 flashing device 0x1bc7/0x9010 requires zero packet to be sent if out data size is equal to the endpoint max size. Signed-off-by: Daniele Palmas <dnlplm@gmail.com> --- V2: removed transfer_length calculations --- drivers/usb/serial/option.c | 8 ++++++++ drivers/usb/serial/usb-wwan.h | 1 + drivers/usb/serial/usb_wwan.c | 2 ++ 3 files changed, 11 insertions(+)