Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'usb-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

I wrote:
  "USB fixes for 4.19-rc7

   Here are some small USB fixes for 4.19-rc7

   These include:
     - the usual xhci bugfixes for reported issues
     - some new serial driver device ids
     - bugfix for the option serial driver for some devices
     - bugfix for the cdc_acm driver that has been there for a long time.

   All of these have been in linux-next for a while with no reported
   issues."

* tag 'usb-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: xhci-mtk: resume USB3 roothub first
  xhci: Add missing CAS workaround for Intel Sunrise Point xHCI
  usb: cdc_acm: Do not leak URB buffers
  USB: serial: simple: add Motorola Tetra MTP6550 id
  USB: serial: option: add two-endpoints device-id flag
  USB: serial: option: improve Quectel EP06 detection
parents 055d8d9e 555df582

drivers/usb/class/cdc-acm.c

+6 −0
Original line number Diff line number Diff line
@@ -1514,6 +1514,7 @@ static void acm_disconnect(struct usb_interface *intf) 
{

	struct acm *acm = usb_get_intfdata(intf);

	struct tty_struct *tty;

	int i;



	/* sibling interface is already cleaning up */

	if (!acm)
@@ -1544,6 +1545,11 @@ static void acm_disconnect(struct usb_interface *intf) 


	tty_unregister_device(acm_tty_driver, acm->minor);



	usb_free_urb(acm->ctrlurb);

	for (i = 0; i < ACM_NW; i++)

		usb_free_urb(acm->wb[i].urb);

	for (i = 0; i < acm->rx_buflimit; i++)

		usb_free_urb(acm->read_urbs[i]);

	acm_write_buffers_free(acm);

	usb_free_coherent(acm->dev, acm->ctrlsize, acm->ctrl_buffer, acm->ctrl_dma);

	acm_read_buffers_free(acm);

drivers/usb/host/xhci-mtk.c

+2 −2
Original line number Diff line number Diff line
@@ -642,10 +642,10 @@ static int __maybe_unused xhci_mtk_resume(struct device *dev) 
	xhci_mtk_host_enable(mtk);



	xhci_dbg(xhci, "%s: restart port polling\n", __func__);

	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	usb_hcd_poll_rh_status(hcd);

	set_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);

	usb_hcd_poll_rh_status(xhci->shared_hcd);

	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	usb_hcd_poll_rh_status(hcd);

	return 0;

}

drivers/usb/host/xhci-pci.c

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
	}

	if (pdev->vendor == PCI_VENDOR_ID_INTEL &&

	    (pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI ||

	     pdev->device == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_XHCI ||

	     pdev->device == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_XHCI ||

	     pdev->device == PCI_DEVICE_ID_INTEL_APL_XHCI ||

	     pdev->device == PCI_DEVICE_ID_INTEL_DNV_XHCI))

		xhci->quirks |= XHCI_MISSING_CAS;

drivers/usb/serial/option.c

+13 −2
Original line number Diff line number Diff line
@@ -561,6 +561,9 @@ static void option_instat_callback(struct urb *urb); 
/* Interface is reserved */

#define RSVD(ifnum)	((BIT(ifnum) & 0xff) << 0)



/* Interface must have two endpoints */

#define NUMEP2		BIT(16)





static const struct usb_device_id option_ids[] = {

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
@@ -1081,8 +1084,9 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(4) },

	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),

	  .driver_info = RSVD(4) },

	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06),

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

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff),

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

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

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003),
@@ -1999,6 +2003,13 @@ static int option_probe(struct usb_serial *serial, 
	if (device_flags & RSVD(iface_desc->bInterfaceNumber))

		return -ENODEV;



	/*

	 * Allow matching on bNumEndpoints for devices whose interface numbers

	 * can change (e.g. Quectel EP06).

	 */

	if (device_flags & NUMEP2 && iface_desc->bNumEndpoints != 2)

		return -ENODEV;



	/* Store the device flags so we can use them during attach. */

	usb_set_serial_data(serial, (void *)device_flags);

drivers/usb/serial/usb-serial-simple.c

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ DEVICE(moto_modem, MOTO_IDS); 


/* Motorola Tetra driver */

#define MOTOROLA_TETRA_IDS()			\

	{ USB_DEVICE(0x0cad, 0x9011) }	/* Motorola Solutions TETRA PEI */

	{ USB_DEVICE(0x0cad, 0x9011) },	/* Motorola Solutions TETRA PEI */ \

	{ USB_DEVICE(0x0cad, 0x9012) }	/* MTP6550 */

DEVICE(motorola_tetra, MOTOROLA_TETRA_IDS);



/* Novatel Wireless GPS driver */