Commit 44aa31a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB driver fixes from Greg KH:
 "Here are some small USB driver fixes for 5.17-rc2 that resolve a
  number of reported problems. These include:

   - typec driver fixes

   - xhci platform driver fixes for suspending

   - ulpi core fix

   - role.h build fix

   - new device ids

   - syzbot-reported bugfixes

   - gadget driver fixes

   - dwc3 driver fixes

   - other small fixes

  All of these have been in linux-next this week with no reported
  issues"

* tag 'usb-5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: cdnsp: Fix segmentation fault in cdns_lost_power function
  usb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend
  usb: gadget: at91_udc: fix incorrect print type
  usb: dwc3: xilinx: Fix error handling when getting USB3 PHY
  usb: dwc3: xilinx: Skip resets and USB3 register settings for USB2.0 mode
  usb: xhci-plat: fix crash when suspend if remote wake enable
  usb: common: ulpi: Fix crash in ulpi_match()
  usb: gadget: f_sourcesink: Fix isoc transfer for USB_SPEED_SUPER_PLUS
  ucsi_ccg: Check DEV_INT bit only when starting CCG4
  USB: core: Fix hang in usb_kill_urb by adding memory barriers
  usb-storage: Add unusual-devs entry for VL817 USB-SATA bridge
  usb: typec: tcpm: Do not disconnect when receiving VSAFE0V
  usb: typec: tcpm: Do not disconnect while receiving VBUS off
  usb: typec: Don't try to register component master without components
  usb: typec: Only attempt to link USB ports if there is fwnode
  usb: typec: tcpci: don't touch CC line if it's Vconn source
  usb: roles: fix include/linux/usb/role.h compile issue
parents cb323ee7 79aa3e19

drivers/usb/cdns3/drd.c

+3 −3
Original line number Diff line number Diff line
@@ -483,11 +483,11 @@ int cdns_drd_exit(struct cdns *cdns) 
/* Indicate the cdns3 core was power lost before */

bool cdns_power_is_lost(struct cdns *cdns)

{

	if (cdns->version == CDNS3_CONTROLLER_V1) {

		if (!(readl(&cdns->otg_v1_regs->simulate) & BIT(0)))

	if (cdns->version == CDNS3_CONTROLLER_V0) {

		if (!(readl(&cdns->otg_v0_regs->simulate) & BIT(0)))

			return true;

	} else {

		if (!(readl(&cdns->otg_v0_regs->simulate) & BIT(0)))

		if (!(readl(&cdns->otg_v1_regs->simulate) & BIT(0)))

			return true;

	}

	return false;

drivers/usb/common/ulpi.c

+5 −2
Original line number Diff line number Diff line
@@ -39,8 +39,11 @@ static int ulpi_match(struct device *dev, struct device_driver *driver) 
	struct ulpi *ulpi = to_ulpi_dev(dev);

	const struct ulpi_device_id *id;



	/* Some ULPI devices don't have a vendor id so rely on OF match */

	if (ulpi->id.vendor == 0)

	/*

	 * Some ULPI devices don't have a vendor id

	 * or provide an id_table so rely on OF match.

	 */

	if (ulpi->id.vendor == 0 || !drv->id_table)

		return of_driver_match_device(dev, driver);



	for (id = drv->id_table; id->vendor; id++)

drivers/usb/core/hcd.c

+14 −0
Original line number Diff line number Diff line
@@ -1563,6 +1563,13 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags) 
		urb->hcpriv = NULL;

		INIT_LIST_HEAD(&urb->urb_list);

		atomic_dec(&urb->use_count);

		/*

		 * Order the write of urb->use_count above before the read

		 * of urb->reject below.  Pairs with the memory barriers in

		 * usb_kill_urb() and usb_poison_urb().

		 */

		smp_mb__after_atomic();



		atomic_dec(&urb->dev->urbnum);

		if (atomic_read(&urb->reject))

			wake_up(&usb_kill_urb_queue);
@@ -1665,6 +1672,13 @@ static void __usb_hcd_giveback_urb(struct urb *urb) 


	usb_anchor_resume_wakeups(anchor);

	atomic_dec(&urb->use_count);

	/*

	 * Order the write of urb->use_count above before the read

	 * of urb->reject below.  Pairs with the memory barriers in

	 * usb_kill_urb() and usb_poison_urb().

	 */

	smp_mb__after_atomic();



	if (unlikely(atomic_read(&urb->reject)))

		wake_up(&usb_kill_urb_queue);

	usb_put_urb(urb);

drivers/usb/core/urb.c

+12 −0
Original line number Diff line number Diff line
@@ -715,6 +715,12 @@ void usb_kill_urb(struct urb *urb) 
	if (!(urb && urb->dev && urb->ep))

		return;

	atomic_inc(&urb->reject);

	/*

	 * Order the write of urb->reject above before the read

	 * of urb->use_count below.  Pairs with the barriers in

	 * __usb_hcd_giveback_urb() and usb_hcd_submit_urb().

	 */

	smp_mb__after_atomic();



	usb_hcd_unlink_urb(urb, -ENOENT);

	wait_event(usb_kill_urb_queue, atomic_read(&urb->use_count) == 0);
@@ -756,6 +762,12 @@ void usb_poison_urb(struct urb *urb) 
	if (!urb)

		return;

	atomic_inc(&urb->reject);

	/*

	 * Order the write of urb->reject above before the read

	 * of urb->use_count below.  Pairs with the barriers in

	 * __usb_hcd_giveback_urb() and usb_hcd_submit_urb().

	 */

	smp_mb__after_atomic();



	if (!urb->dev || !urb->ep)

		return;

drivers/usb/dwc2/gadget.c

+1 −1
Original line number Diff line number Diff line
@@ -5097,7 +5097,7 @@ int dwc2_hsotg_suspend(struct dwc2_hsotg *hsotg) 
		hsotg->gadget.speed = USB_SPEED_UNKNOWN;

		spin_unlock_irqrestore(&hsotg->lock, flags);



		for (ep = 0; ep < hsotg->num_of_eps; ep++) {

		for (ep = 1; ep < hsotg->num_of_eps; ep++) {

			if (hsotg->eps_in[ep])

				dwc2_hsotg_ep_disable_lock(&hsotg->eps_in[ep]->ep);

			if (hsotg->eps_out[ep])