Commit efb3ecdc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-5.5-rc5' of... 

Merge tag 'usb-serial-5.5-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-linus

Johan writes:

USB-serial fixes for 5.5-rc5

Here's a couple of new modem device ids, including a new quirk for
devices that expect zero-length packets.

Due to the holidays, only the first one has been in linux-next and with
no reported issues.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>

* tag 'usb-serial-5.5-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add ZLP support for 0x1bc7/0x9010
  USB: serial: option: add Telit ME910G1 0x110a composition
parents 5041a58d 2438c3a1

drivers/usb/serial/option.c

+10 −0
Original line number Diff line number Diff line
@@ -567,6 +567,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) },
@@ -1172,6 +1175,8 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = NCTRL(0) | RSVD(3) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1102, 0xff),	/* Telit ME910 (ECM) */

	  .driver_info = NCTRL(0) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x110a, 0xff),	/* Telit ME910G1 */

	  .driver_info = NCTRL(0) | RSVD(3) },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910),

	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910_USBCFG4),
@@ -1196,6 +1201,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) },
@@ -2097,6 +2104,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);

drivers/usb/serial/usb-wwan.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/usb/serial/usb_wwan.c

+4 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ static struct urb *usb_wwan_setup_urb(struct usb_serial_port *port, 
				      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 */
@@ -471,6 +472,9 @@ static struct urb *usb_wwan_setup_urb(struct usb_serial_port *port, 
			  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;

}