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

Commit a638af00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are a number of USB fixes for 4.16-rc3

  Nothing major, but a number of different fixes all over the place in
  the USB stack for reported issues. Mostly gadget driver fixes,
  although the typical set of xhci bugfixes are there, along with some
  new quirks additions as well.

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

* tag 'usb-4.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (39 commits)
  Revert "usb: musb: host: don't start next rx urb if current one failed"
  usb: musb: fix enumeration after resume
  usb: cdc_acm: prevent race at write to acm while system resumes
  Add delay-init quirk for Corsair K70 RGB keyboards
  usb: ohci: Proper handling of ed_rm_list to handle race condition between usb_kill_urb() and finish_unlinks()
  usb: host: ehci: always enable interrupt for qtd completion at test mode
  usb: ldusb: add PIDs for new CASSY devices supported by this driver
  usb: renesas_usbhs: missed the "running" flag in usb_dmac with rx path
  usb: host: ehci: use correct device pointer for dma ops
  usbip: keep usbip_device sockfd state in sync with tcp_socket
  ohci-hcd: Fix race condition caused by ohci_urb_enqueue() and io_watchdog_func()
  USB: serial: option: Add support for Quectel EP06
  xhci: fix xhci debugfs errors in xhci_stop
  xhci: xhci debugfs device nodes weren't removed after device plugged out
  xhci: Fix xhci debugfs devices node disappearance after hibernation
  xhci: Fix NULL pointer in xhci debugfs
  xhci: Don't print a warning when setting link state for disabled ports
  xhci: workaround for AMD Promontory disabled ports wakeup
  usb: dwc3: core: Fix ULPI PHYs and prevent phy_get/ulpi_init during suspend/resume
  USB: gadget: udc: Add missing platform_device_put() on error in bdc_pci_probe()
  ...
parents 77f892eb 44eb5e12

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -645,6 +645,9 @@ 
#define USB_DEVICE_ID_LD_MICROCASSYTIME		0x1033

#define USB_DEVICE_ID_LD_MICROCASSYTEMPERATURE	0x1035

#define USB_DEVICE_ID_LD_MICROCASSYPH		0x1038

#define USB_DEVICE_ID_LD_POWERANALYSERCASSY	0x1040

#define USB_DEVICE_ID_LD_CONVERTERCONTROLLERCASSY	0x1042

#define USB_DEVICE_ID_LD_MACHINETESTCASSY	0x1043

#define USB_DEVICE_ID_LD_JWM		0x1080

#define USB_DEVICE_ID_LD_DMMP		0x1081

#define USB_DEVICE_ID_LD_UMIP		0x1090

drivers/hid/hid-quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -809,6 +809,9 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYTIME) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYTEMPERATURE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MICROCASSYPH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERANALYSERCASSY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CONVERTERCONTROLLERCASSY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETESTCASSY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP) },

drivers/usb/class/cdc-acm.c

+6 −3
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ static int acm_wb_alloc(struct acm *acm) 
		wb = &acm->wb[wbn];

		if (!wb->use) {

			wb->use = 1;

			wb->len = 0;

			return wbn;

		}

		wbn = (wbn + 1) % ACM_NW;
@@ -805,16 +806,18 @@ static int acm_tty_write(struct tty_struct *tty, 
static void acm_tty_flush_chars(struct tty_struct *tty)

{

	struct acm *acm = tty->driver_data;

	struct acm_wb *cur = acm->putbuffer;

	struct acm_wb *cur;

	int err;

	unsigned long flags;



	spin_lock_irqsave(&acm->write_lock, flags);



	cur = acm->putbuffer;

	if (!cur) /* nothing to do */

		return;

		goto out;



	acm->putbuffer = NULL;

	err = usb_autopm_get_interface_async(acm->control);

	spin_lock_irqsave(&acm->write_lock, flags);

	if (err < 0) {

		cur->use = 0;

		acm->putbuffer = cur;

drivers/usb/core/quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -226,6 +226,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	{ USB_DEVICE(0x1a0a, 0x0200), .driver_info =

			USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL },



	/* Corsair K70 RGB */

	{ USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT },



	/* Corsair Strafe RGB */

	{ USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT },

drivers/usb/dwc2/gadget.c

+16 −10
Original line number Diff line number Diff line
@@ -1917,7 +1917,9 @@ static void dwc2_hsotg_program_zlp(struct dwc2_hsotg *hsotg, 
		/* Not specific buffer needed for ep0 ZLP */

		dma_addr_t dma = hs_ep->desc_list_dma;



		if (!index)

			dwc2_gadget_set_ep0_desc_chain(hsotg, hs_ep);



		dwc2_gadget_config_nonisoc_xfer_ddma(hs_ep, dma, 0);

	} else {

		dwc2_writel(DXEPTSIZ_MC(1) | DXEPTSIZ_PKTCNT(1) |
@@ -2974,11 +2976,15 @@ static void dwc2_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx, 
	if (ints & DXEPINT_STSPHSERCVD) {

		dev_dbg(hsotg->dev, "%s: StsPhseRcvd\n", __func__);



		/* Safety check EP0 state when STSPHSERCVD asserted */

		if (hsotg->ep0_state == DWC2_EP0_DATA_OUT) {

			/* Move to STATUS IN for DDMA */

			if (using_desc_dma(hsotg))

				dwc2_hsotg_ep0_zlp(hsotg, true);

		}



	}



	if (ints & DXEPINT_BACK2BACKSETUP)

		dev_dbg(hsotg->dev, "%s: B2BSetup/INEPNakEff\n", __func__);
@@ -3375,12 +3381,6 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, 
	dwc2_writel(dwc2_hsotg_ep0_mps(hsotg->eps_out[0]->ep.maxpacket) |

	       DXEPCTL_USBACTEP, hsotg->regs + DIEPCTL0);



	dwc2_hsotg_enqueue_setup(hsotg);



	dev_dbg(hsotg->dev, "EP0: DIEPCTL0=0x%08x, DOEPCTL0=0x%08x\n",

		dwc2_readl(hsotg->regs + DIEPCTL0),

		dwc2_readl(hsotg->regs + DOEPCTL0));



	/* clear global NAKs */

	val = DCTL_CGOUTNAK | DCTL_CGNPINNAK;

	if (!is_usb_reset)
@@ -3391,6 +3391,12 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, 
	mdelay(3);



	hsotg->lx_state = DWC2_L0;



	dwc2_hsotg_enqueue_setup(hsotg);



	dev_dbg(hsotg->dev, "EP0: DIEPCTL0=0x%08x, DOEPCTL0=0x%08x\n",

		dwc2_readl(hsotg->regs + DIEPCTL0),

		dwc2_readl(hsotg->regs + DOEPCTL0));

}



static void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg)