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

Merge tag 'usb-serial-5.15-rc3' of... 

Merge tag 'usb-serial-5.15-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes:

USB-serial fixes for 5.15-rc3

Here's a fix for a regression affecting some CP2102 devices and a host
of new device ids.

Included are also a couple of cleanups of duplicate device ids, which
are also tagged for stable to keep the tables in sync, and a trivial
patch to help debugging cp210x issues.

All have been in linux-next with no reported issues. Note however that
the last last two device-id commits were rebased to fix up a lore link
in a commit message (as the patch itself never made it to the list).

* tag 'usb-serial-5.15-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add device id for Foxconn T99W265
  USB: serial: cp210x: add ID for GW Instek GDM-834x Digital Multimeter
  USB: serial: cp210x: add part-number debug printk
  USB: serial: cp210x: fix dropped characters with CP2102
  USB: serial: option: remove duplicate USB device ID
  USB: serial: mos7840: remove duplicated 0xac24 device ID
  USB: serial: option: add Telit LN920 compositions
parents f7d848e0 9e3eed53

drivers/usb/serial/cp210x.c

+38 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x1FB9, 0x0602) }, /* Lake Shore Model 648 Magnet Power Supply */

	{ USB_DEVICE(0x1FB9, 0x0700) }, /* Lake Shore Model 737 VSM Controller */

	{ USB_DEVICE(0x1FB9, 0x0701) }, /* Lake Shore Model 776 Hall Matrix */

	{ USB_DEVICE(0x2184, 0x0030) }, /* GW Instek GDM-834x Digital Multimeter */

	{ USB_DEVICE(0x2626, 0xEA60) }, /* Aruba Networks 7xxx USB Serial Console */

	{ USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */

	{ USB_DEVICE(0x3195, 0xF280) }, /* Link Instruments MSO-28 */
@@ -258,6 +259,7 @@ struct cp210x_serial_private { 
	speed_t			max_speed;

	bool			use_actual_rate;

	bool			no_flow_control;

	bool			no_event_mode;

};



enum cp210x_event_state {
@@ -1113,12 +1115,16 @@ static void cp210x_change_speed(struct tty_struct *tty, 


static void cp210x_enable_event_mode(struct usb_serial_port *port)

{

	struct cp210x_serial_private *priv = usb_get_serial_data(port->serial);

	struct cp210x_port_private *port_priv = usb_get_serial_port_data(port);

	int ret;



	if (port_priv->event_mode)

		return;



	if (priv->no_event_mode)

		return;



	port_priv->event_state = ES_DATA;

	port_priv->event_mode = true;
@@ -2074,6 +2080,33 @@ static void cp210x_init_max_speed(struct usb_serial *serial) 
	priv->use_actual_rate = use_actual_rate;

}



static void cp2102_determine_quirks(struct usb_serial *serial)

{

	struct cp210x_serial_private *priv = usb_get_serial_data(serial);

	u8 *buf;

	int ret;



	buf = kmalloc(2, GFP_KERNEL);

	if (!buf)

		return;

	/*

	 * Some (possibly counterfeit) CP2102 do not support event-insertion

	 * mode and respond differently to malformed vendor requests.

	 * Specifically, they return one instead of two bytes when sent a

	 * two-byte part-number request.

	 */

	ret = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),

			CP210X_VENDOR_SPECIFIC, REQTYPE_DEVICE_TO_HOST,

			CP210X_GET_PARTNUM, 0, buf, 2, USB_CTRL_GET_TIMEOUT);

	if (ret == 1) {

		dev_dbg(&serial->interface->dev,

				"device does not support event-insertion mode\n");

		priv->no_event_mode = true;

	}



	kfree(buf);

}



static int cp210x_get_fw_version(struct usb_serial *serial, u16 value)

{

	struct cp210x_serial_private *priv = usb_get_serial_data(serial);
@@ -2108,7 +2141,12 @@ static void cp210x_determine_type(struct usb_serial *serial) 
		return;

	}



	dev_dbg(&serial->interface->dev, "partnum = 0x%02x\n", priv->partnum);



	switch (priv->partnum) {

	case CP210X_PARTNUM_CP2102:

		cp2102_determine_quirks(serial);

		break;

	case CP210X_PARTNUM_CP2105:

	case CP210X_PARTNUM_CP2108:

		cp210x_get_fw_version(serial, CP210X_GET_FW_VER);

drivers/usb/serial/mos7840.c

+0 −2
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ 
#define BANDB_DEVICE_ID_USOPTL4_2P       0xBC02

#define BANDB_DEVICE_ID_USOPTL4_4        0xAC44

#define BANDB_DEVICE_ID_USOPTL4_4P       0xBC03

#define BANDB_DEVICE_ID_USOPTL2_4        0xAC24



/* Interrupt Routine Defines    */
@@ -186,7 +185,6 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2P) },

	{ USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4) },

	{ USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4P) },

	{ USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4) },

	{}			/* terminating entry */

};

MODULE_DEVICE_TABLE(usb, id_table);

drivers/usb/serial/option.c

+10 −1
Original line number Diff line number Diff line
@@ -1205,6 +1205,14 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = NCTRL(0) | RSVD(1) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1056, 0xff),	/* Telit FD980 */

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

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1060, 0xff),	/* Telit LN920 (rmnet) */

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

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1061, 0xff),	/* Telit LN920 (MBIM) */

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

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1062, 0xff),	/* Telit LN920 (RNDIS) */

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

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1063, 0xff),	/* Telit LN920 (ECM) */

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

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910),

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

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM),
@@ -1650,7 +1658,6 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0060, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0070, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0073, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0094, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0130, 0xff, 0xff, 0xff),

	  .driver_info = RSVD(1) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0133, 0xff, 0xff, 0xff),
@@ -2068,6 +2075,8 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },

	{ USB_DEVICE(0x0489, 0xe0b5),						/* Foxconn T77W968 ESIM */

	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },

	{ USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0db, 0xff),			/* Foxconn T99W265 MBIM */

	  .driver_info = RSVD(3) },

	{ USB_DEVICE(0x1508, 0x1001),						/* Fibocom NL668 (IOT version) */

	  .driver_info = RSVD(4) | RSVD(5) | RSVD(6) },

	{ USB_DEVICE(0x2cb7, 0x0104),						/* Fibocom NL678 series */