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

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

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

Johan writes:

USB-serial fixes for 5.11-rc3

Here's a fix for a DMA-from-stack issue in iuu_phoenix and a couple of
new modem device ids.

All have been in linux-next with no reported issues.

* tag 'usb-serial-5.11-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: iuu_phoenix: fix DMA from stack
  USB: serial: option: add LongSung M5710 module support
  USB: serial: option: add Quectel EM160R-GL
parents 96ebc9c8 54d0a3ab

drivers/usb/serial/iuu_phoenix.c

+15 −5
Original line number Diff line number Diff line
@@ -532,23 +532,29 @@ static int iuu_uart_flush(struct usb_serial_port *port) 
	struct device *dev = &port->dev;

	int i;

	int status;

	u8 rxcmd = IUU_UART_RX;

	u8 *rxcmd;

	struct iuu_private *priv = usb_get_serial_port_data(port);



	if (iuu_led(port, 0xF000, 0, 0, 0xFF) < 0)

		return -EIO;



	rxcmd = kmalloc(1, GFP_KERNEL);

	if (!rxcmd)

		return -ENOMEM;



	rxcmd[0] = IUU_UART_RX;



	for (i = 0; i < 2; i++) {

		status = bulk_immediate(port, &rxcmd, 1);

		status = bulk_immediate(port, rxcmd, 1);

		if (status != IUU_OPERATION_OK) {

			dev_dbg(dev, "%s - uart_flush_write error\n", __func__);

			return status;

			goto out_free;

		}



		status = read_immediate(port, &priv->len, 1);

		if (status != IUU_OPERATION_OK) {

			dev_dbg(dev, "%s - uart_flush_read error\n", __func__);

			return status;

			goto out_free;

		}



		if (priv->len > 0) {
@@ -556,12 +562,16 @@ static int iuu_uart_flush(struct usb_serial_port *port) 
			status = read_immediate(port, priv->buf, priv->len);

			if (status != IUU_OPERATION_OK) {

				dev_dbg(dev, "%s - uart_flush_read error\n", __func__);

				return status;

				goto out_free;

			}

		}

	}

	dev_dbg(dev, "%s - uart_flush_read OK!\n", __func__);

	iuu_led(port, 0, 0xF000, 0, 0xFF);



out_free:

	kfree(rxcmd);



	return status;

}

drivers/usb/serial/option.c

+3 −0
Original line number Diff line number Diff line
@@ -1117,6 +1117,8 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0xff, 0xff),

	  .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, 0x0620, 0xff, 0xff, 0x30) },	/* EM160R-GL */

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, 0x0620, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x30) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10),
@@ -2057,6 +2059,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0105, 0xff),			/* Fibocom NL678 series */

	  .driver_info = RSVD(6) },

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) },			/* Fibocom NL668-AM/NL652-EU (laptop MBIM) */

	{ USB_DEVICE_INTERFACE_CLASS(0x2df3, 0x9d03, 0xff) },			/* LongSung M5710 */

	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1404, 0xff) },			/* GosunCn GM500 RNDIS */

	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1405, 0xff) },			/* GosunCn GM500 MBIM */

	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1406, 0xff) },			/* GosunCn GM500 ECM/NCM */