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

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

Pull USB / Thunderbolt fixes from Greg KH:
 "Here are a number of small USB and Thunderbolt driver fixes and new
  device id changes for 6.2-rc5. Included in here are:

   - thunderbolt bugfixes for reported problems

   - new usb-serial driver ids added

   - onboard_hub usb driver fixes for much-reported problems

   - xhci bugfixes

   - typec bugfixes

   - ehci-fsl driver module alias fix

   - iowarrior header size fix

   - usb gadget driver fixes

  All of these, except for the iowarrior fix, have been in linux-next
  with no reported issues. The iowarrior fix passed the 0-day testing
  and is a one digit change based on a reported problem in the driver
  (which was written to a spec, not the real device that is now
  available)"

* tag 'usb-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (40 commits)
  USB: misc: iowarrior: fix up header size for USB_DEVICE_ID_CODEMERCS_IOW100
  usb: host: ehci-fsl: Fix module alias
  usb: dwc3: fix extcon dependency
  usb: core: hub: disable autosuspend for TI TUSB8041
  USB: fix misleading usb_set_intfdata() kernel doc
  usb: gadget: f_ncm: fix potential NULL ptr deref in ncm_bitrate()
  USB: gadget: Add ID numbers to configfs-gadget driver names
  usb: typec: tcpm: Fix altmode re-registration causes sysfs create fail
  usb: gadget: g_webcam: Send color matching descriptor per frame
  usb: typec: altmodes/displayport: Use proper macro for pin assignment check
  usb: typec: altmodes/displayport: Fix pin assignment calculation
  usb: typec: altmodes/displayport: Add pin assignment helper
  usb: gadget: f_fs: Ensure ep0req is dequeued before free_request
  usb: gadget: f_fs: Prevent race during ffs_ep0_queue_wait
  usb: misc: onboard_hub: Move 'attach' work to the driver
  usb: misc: onboard_hub: Invert driver registration order
  usb: ucsi: Ensure connector delayed work items are flushed
  usb: musb: fix error return code in omap2430_probe()
  usb: chipidea: core: fix possible constant 0 if use IS_ERR(ci->role_switch)
  xhci: Detect lpm incapable xHC USB3 roothub ports from ACPI tables
  ...
parents 83cd5fd0 14ff7460

drivers/thunderbolt/retimer.c

+4 −16
Original line number Diff line number Diff line
@@ -427,13 +427,6 @@ int tb_retimer_scan(struct tb_port *port, bool add) 
{

	u32 status[TB_MAX_RETIMER_INDEX + 1] = {};

	int ret, i, last_idx = 0;

	struct usb4_port *usb4;



	usb4 = port->usb4;

	if (!usb4)

		return 0;



	pm_runtime_get_sync(&usb4->dev);



	/*

	 * Send broadcast RT to make sure retimer indices facing this
@@ -441,7 +434,7 @@ int tb_retimer_scan(struct tb_port *port, bool add) 
	 */

	ret = usb4_port_enumerate_retimers(port);

	if (ret)

		goto out;

		return ret;



	/*

	 * Enable sideband channel for each retimer. We can do this
@@ -471,12 +464,11 @@ int tb_retimer_scan(struct tb_port *port, bool add) 
			break;

	}



	if (!last_idx) {

		ret = 0;

		goto out;

	}

	if (!last_idx)

		return 0;



	/* Add on-board retimers if they do not exist already */

	ret = 0;

	for (i = 1; i <= last_idx; i++) {

		struct tb_retimer *rt;
@@ -490,10 +482,6 @@ int tb_retimer_scan(struct tb_port *port, bool add) 
		}

	}



out:

	pm_runtime_mark_last_busy(&usb4->dev);

	pm_runtime_put_autosuspend(&usb4->dev);



	return ret;

}

drivers/thunderbolt/tb.c

+15 −5
Original line number Diff line number Diff line
@@ -628,11 +628,15 @@ static void tb_scan_port(struct tb_port *port) 
			 * Downstream switch is reachable through two ports.

			 * Only scan on the primary port (link_nr == 0).

			 */



	if (port->usb4)

		pm_runtime_get_sync(&port->usb4->dev);



	if (tb_wait_for_port(port, false) <= 0)

		return;

		goto out_rpm_put;

	if (port->remote) {

		tb_port_dbg(port, "port already has a remote\n");

		return;

		goto out_rpm_put;

	}



	tb_retimer_scan(port, true);
@@ -647,12 +651,12 @@ static void tb_scan_port(struct tb_port *port) 
		 */

		if (PTR_ERR(sw) == -EIO || PTR_ERR(sw) == -EADDRNOTAVAIL)

			tb_scan_xdomain(port);

		return;

		goto out_rpm_put;

	}



	if (tb_switch_configure(sw)) {

		tb_switch_put(sw);

		return;

		goto out_rpm_put;

	}



	/*
@@ -681,7 +685,7 @@ static void tb_scan_port(struct tb_port *port) 


	if (tb_switch_add(sw)) {

		tb_switch_put(sw);

		return;

		goto out_rpm_put;

	}



	/* Link the switches using both links if available */
@@ -733,6 +737,12 @@ static void tb_scan_port(struct tb_port *port) 


	tb_add_dp_resources(sw);

	tb_scan_switch(sw);



out_rpm_put:

	if (port->usb4) {

		pm_runtime_mark_last_busy(&port->usb4->dev);

		pm_runtime_put_autosuspend(&port->usb4->dev);

	}

}



static void tb_deactivate_and_free_tunnel(struct tb_tunnel *tunnel)

drivers/thunderbolt/tunnel.c

+1 −1
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ static void tb_usb3_reclaim_available_bandwidth(struct tb_tunnel *tunnel, 
		return;

	} else if (!ret) {

		/* Use maximum link rate if the link valid is not set */

		ret = usb4_usb3_port_max_link_rate(tunnel->src_port);

		ret = tb_usb3_max_link_rate(tunnel->dst_port, tunnel->src_port);

		if (ret < 0) {

			tb_tunnel_warn(tunnel, "failed to read maximum link rate\n");

			return;

drivers/thunderbolt/xdomain.c

+12 −5
Original line number Diff line number Diff line
@@ -1419,12 +1419,19 @@ static int tb_xdomain_get_properties(struct tb_xdomain *xd) 
	 * registered, we notify the userspace that it has changed.

	 */

	if (!update) {

		/*

		 * Now disable lane 1 if bonding was not enabled. Do

		 * this only if bonding was possible at the beginning

		 * (that is we are the connection manager and there are

		 * two lanes).

		 */

		if (xd->bonding_possible) {

			struct tb_port *port;



		/* Now disable lane 1 if bonding was not enabled */

			port = tb_port_at(xd->route, tb_xdomain_parent(xd));

			if (!port->bonded)

				tb_port_disable(port->dual_link_port);

		}



		if (device_add(&xd->dev)) {

			dev_err(&xd->dev, "failed to add XDomain device\n");

drivers/usb/cdns3/cdns3-gadget.c

+12 −0
Original line number Diff line number Diff line
@@ -2614,6 +2614,7 @@ int cdns3_gadget_ep_dequeue(struct usb_ep *ep, 
	u8 req_on_hw_ring = 0;

	unsigned long flags;

	int ret = 0;

	int val;



	if (!ep || !request || !ep->desc)

		return -EINVAL;
@@ -2649,6 +2650,13 @@ int cdns3_gadget_ep_dequeue(struct usb_ep *ep, 


	/* Update ring only if removed request is on pending_req_list list */

	if (req_on_hw_ring && link_trb) {

		/* Stop DMA */

		writel(EP_CMD_DFLUSH, &priv_dev->regs->ep_cmd);



		/* wait for DFLUSH cleared */

		readl_poll_timeout_atomic(&priv_dev->regs->ep_cmd, val,

					  !(val & EP_CMD_DFLUSH), 1, 1000);



		link_trb->buffer = cpu_to_le32(TRB_BUFFER(priv_ep->trb_pool_dma +

			((priv_req->end_trb + 1) * TRB_SIZE)));

		link_trb->control = cpu_to_le32((le32_to_cpu(link_trb->control) & TRB_CYCLE) |
@@ -2660,6 +2668,10 @@ int cdns3_gadget_ep_dequeue(struct usb_ep *ep, 


	cdns3_gadget_giveback(priv_ep, priv_req, -ECONNRESET);



	req = cdns3_next_request(&priv_ep->pending_req_list);

	if (req)

		cdns3_rearm_transfer(priv_ep, 1);



not_found:

	spin_unlock_irqrestore(&priv_dev->lock, flags);

	return ret;