lkml.org 
[lkml]   [2020]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 16/39] USB: serial: option: add ZLP support for 0x1bc7/0x9010
    Date
    From: Daniele Palmas <dnlplm@gmail.com>

    commit 2438c3a19dec5e98905fd3ffcc2f24716aceda6b upstream.

    Telit FN980 flashing device 0x1bc7/0x9010 requires zero packet
    to be sent if out data size is is equal to the endpoint max size.

    Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
    [ johan: switch operands in conditional ]
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/serial/option.c | 8 ++++++++
    drivers/usb/serial/usb-wwan.h | 1 +
    drivers/usb/serial/usb_wwan.c | 4 ++++
    3 files changed, 13 insertions(+)

    --- a/drivers/usb/serial/option.c
    +++ b/drivers/usb/serial/option.c
    @@ -570,6 +570,9 @@ static void option_instat_callback(struc
    /* 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) },
    @@ -1201,6 +1204,8 @@ static const struct usb_device_id option
    .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) },
    @@ -2109,6 +2114,9 @@ static int option_attach(struct usb_seri
    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);
    --- a/drivers/usb/serial/usb-wwan.h
    +++ b/drivers/usb/serial/usb-wwan.h
    @@ -36,6 +36,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;
    --- a/drivers/usb/serial/usb_wwan.c
    +++ b/drivers/usb/serial/usb_wwan.c
    @@ -492,6 +492,7 @@ static struct urb *usb_wwan_setup_urb(st
    void (*callback) (struct urb *))
    {
    struct usb_serial *serial = port->serial;
    + struct usb_wwan_intf_private *intfdata = usb_get_serial_data(serial);
    struct urb *urb;

    urb = usb_alloc_urb(0, GFP_KERNEL); /* No ISO */
    @@ -502,6 +503,9 @@ static struct urb *usb_wwan_setup_urb(st
    usb_sndbulkpipe(serial->dev, endpoint) | dir,
    buf, len, callback, ctx);

    + if (intfdata->use_zlp && dir == USB_DIR_OUT)
    + urb->transfer_flags |= URB_ZERO_PACKET;
    +
    return urb;
    }


    \
     
     \ /
      Last update: 2020-01-14 11:10    [W:4.105 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site