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

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

Pull USB fixes from Greg KH:
 "Here are a number of small USB driver fixes for reported problems.
  They include:

   - dwc2 driver fixes

   - xhci driver fixes

   - cdnsp driver fixes

   - typec driver fix

   - gadget u_ether driver fix

   - new quirk additions

   - usb gadget endpoint calculation fix

   - usb serial new device ids

   - revert of a xhci-dbg change that broke early debug booting

  All changes, except for the revert, have been in linux-next with no
  reported problems. The revert was from yesterday, and it was reported
  by the developers affected that it resolved their problem"

* tag 'usb-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  Revert "usb: early: convert to readl_poll_timeout_atomic()"
  usb: typec: tcpm: fix tcpm unregister port but leave a pending timer
  usb: cdnsp: Fix lack of spin_lock_irqsave/spin_lock_restore
  USB: NO_LPM quirk Lenovo USB-C to Ethernet Adapher(RTL8153-04)
  usb: xhci: Extend support for runtime power management for AMD's Yellow carp.
  usb: dwc2: fix STM ID/VBUS detection startup delay in dwc2_driver_probe
  USB: gadget: bRequestType is a bitfield, not a enum
  USB: serial: option: add Telit FN990 compositions
  USB: serial: cp210x: fix CP2105 GPIO registration
  usb: cdnsp: Fix incorrect status for control request
  usb: cdnsp: Fix issue in cdnsp_log_ep trace event
  usb: cdnsp: Fix incorrect calling of cdnsp_died function
  usb: xhci-mtk: fix list_del warning when enable list debug
  usb: gadget: u_ether: fix race in setting MAC address in setup phase
parents 0f03adcc c4d936ef

drivers/usb/cdns3/cdnsp-gadget.c

+12 −0
Original line number Diff line number Diff line
@@ -1541,15 +1541,27 @@ static int cdnsp_gadget_pullup(struct usb_gadget *gadget, int is_on) 
{

	struct cdnsp_device *pdev = gadget_to_cdnsp(gadget);

	struct cdns *cdns = dev_get_drvdata(pdev->dev);

	unsigned long flags;



	trace_cdnsp_pullup(is_on);



	/*

	 * Disable events handling while controller is being

	 * enabled/disabled.

	 */

	disable_irq(cdns->dev_irq);

	spin_lock_irqsave(&pdev->lock, flags);



	if (!is_on) {

		cdnsp_reset_device(pdev);

		cdns_clear_vbus(cdns);

	} else {

		cdns_set_vbus(cdns);

	}



	spin_unlock_irqrestore(&pdev->lock, flags);

	enable_irq(cdns->dev_irq);



	return 0;

}

drivers/usb/cdns3/cdnsp-ring.c

+10 −1
Original line number Diff line number Diff line
@@ -1029,6 +1029,8 @@ static void cdnsp_process_ctrl_td(struct cdnsp_device *pdev, 
		return;

	}



	*status = 0;



	cdnsp_finish_td(pdev, td, event, pep, status);

}
@@ -1523,7 +1525,14 @@ irqreturn_t cdnsp_thread_irq_handler(int irq, void *data) 
	spin_lock_irqsave(&pdev->lock, flags);



	if (pdev->cdnsp_state & (CDNSP_STATE_HALTED | CDNSP_STATE_DYING)) {

		/*

		 * While removing or stopping driver there may still be deferred

		 * not handled interrupt which should not be treated as error.

		 * Driver should simply ignore it.

		 */

		if (pdev->gadget_driver)

			cdnsp_died(pdev);



		spin_unlock_irqrestore(&pdev->lock, flags);

		return IRQ_HANDLED;

	}

drivers/usb/cdns3/cdnsp-trace.h

+2 −2
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ DECLARE_EVENT_CLASS(cdnsp_log_ep, 
		__entry->first_prime_det = pep->stream_info.first_prime_det;

		__entry->drbls_count = pep->stream_info.drbls_count;

	),

	TP_printk("%s: SID: %08x ep state: %x stream: enabled: %d num  %d "

	TP_printk("%s: SID: %08x, ep state: %x, stream: enabled: %d num %d "

		  "tds %d, first prime: %d drbls %d",

		  __get_str(name), __entry->state, __entry->stream_id,

		  __get_str(name), __entry->stream_id, __entry->state,

		  __entry->enabled, __entry->num_streams, __entry->td_count,

		  __entry->first_prime_det, __entry->drbls_count)

);

drivers/usb/core/quirks.c

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

			USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL },



	/* Lenovo USB-C to Ethernet Adapter RTL8153-04 */

	{ USB_DEVICE(0x17ef, 0x720c), .driver_info = USB_QUIRK_NO_LPM },



	/* Lenovo Powered USB-C Travel Hub (4X90S92381, RTL8153 GigE) */

	{ USB_DEVICE(0x17ef, 0x721e), .driver_info = USB_QUIRK_NO_LPM },

drivers/usb/dwc2/platform.c

+3 −0
Original line number Diff line number Diff line
@@ -575,6 +575,9 @@ static int dwc2_driver_probe(struct platform_device *dev) 
		ggpio |= GGPIO_STM32_OTG_GCCFG_IDEN;

		ggpio |= GGPIO_STM32_OTG_GCCFG_VBDEN;

		dwc2_writel(hsotg, ggpio, GGPIO);



		/* ID/VBUS detection startup time */

		usleep_range(5000, 7000);

	}



	retval = dwc2_drd_init(hsotg);