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

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

Pull USB / Thunderbolt fixes from Greg KH:
 "Here are some small USB and Thunderbolt driver fixes for 6.12-rc6 that
  have been sitting in my tree this week. Included in here are the
  following:

   - thunderbolt driver fixes for reported issues

   - USB typec driver fixes

   - xhci driver fixes for reported problems

   - dwc2 driver revert for a broken change

   - usb phy driver fix

   - usbip tool fix

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

* tag 'usb-6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: typec: tcpm: restrict SNK_WAIT_CAPABILITIES_TIMEOUT transitions to non self-powered devices
  usb: phy: Fix API devm_usb_put_phy() can not release the phy
  usb: typec: use cleanup facility for 'altmodes_node'
  usb: typec: fix unreleased fwnode_handle in typec_port_register_altmodes()
  usb: typec: qcom-pmic-typec: fix missing fwnode removal in error path
  usb: typec: qcom-pmic-typec: use fwnode_handle_put() to release fwnodes
  usb: acpi: fix boot hang due to early incorrect 'tunneled' USB3 device links
  Revert "usb: dwc2: Skip clock gating on Broadcom SoCs"
  xhci: Fix Link TRB DMA in command ring stopped completion event
  xhci: Use pm_runtime_get to prevent RPM on unsupported systems
  usbip: tools: Fix detach_port() invalid port error path
  thunderbolt: Honor TMU requirements in the domain when setting TMU mode
  thunderbolt: Fix KASAN reported stack out-of-bounds read in tb_retimer_scan()
parents 32cfb3c4 afb92ad8

drivers/thunderbolt/retimer.c

+3 −2
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ int tb_retimer_scan(struct tb_port *port, bool add) 
	 */

	tb_retimer_set_inbound_sbtx(port);



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

	for (max = 1, i = 1; i <= TB_MAX_RETIMER_INDEX; i++) {

		/*

		 * Last retimer is true only for the last on-board

		 * retimer (the one connected directly to the Type-C
@@ -527,9 +527,10 @@ int tb_retimer_scan(struct tb_port *port, bool add) 
			last_idx = i;

		else if (ret < 0)

			break;

	}



		max = i;

	}



	ret = 0;



	/* Add retimers if they do not exist already */

drivers/thunderbolt/tb.c

+42 −6
Original line number Diff line number Diff line
@@ -288,6 +288,24 @@ static void tb_increase_tmu_accuracy(struct tb_tunnel *tunnel) 
	device_for_each_child(&sw->dev, NULL, tb_increase_switch_tmu_accuracy);

}



static int tb_switch_tmu_hifi_uni_required(struct device *dev, void *not_used)

{

	struct tb_switch *sw = tb_to_switch(dev);



	if (sw && tb_switch_tmu_is_enabled(sw) &&

	    tb_switch_tmu_is_configured(sw, TB_SWITCH_TMU_MODE_HIFI_UNI))

		return 1;



	return device_for_each_child(dev, NULL,

				     tb_switch_tmu_hifi_uni_required);

}



static bool tb_tmu_hifi_uni_required(struct tb *tb)

{

	return device_for_each_child(&tb->dev, NULL,

				     tb_switch_tmu_hifi_uni_required) == 1;

}



static int tb_enable_tmu(struct tb_switch *sw)

{

	int ret;
@@ -302,12 +320,30 @@ static int tb_enable_tmu(struct tb_switch *sw) 
	ret = tb_switch_tmu_configure(sw,

			TB_SWITCH_TMU_MODE_MEDRES_ENHANCED_UNI);

	if (ret == -EOPNOTSUPP) {

		if (tb_switch_clx_is_enabled(sw, TB_CL1))

		if (tb_switch_clx_is_enabled(sw, TB_CL1)) {

			/*

			 * Figure out uni-directional HiFi TMU requirements

			 * currently in the domain. If there are no

			 * uni-directional HiFi requirements we can put the TMU

			 * into LowRes mode.

			 *

			 * Deliberately skip bi-directional HiFi links

			 * as these work independently of other links

			 * (and they do not allow any CL states anyway).

			 */

			if (tb_tmu_hifi_uni_required(sw->tb))

				ret = tb_switch_tmu_configure(sw,

					TB_SWITCH_TMU_MODE_LOWRES);

						TB_SWITCH_TMU_MODE_HIFI_UNI);

			else

				ret = tb_switch_tmu_configure(sw,

					TB_SWITCH_TMU_MODE_HIFI_BI);

						TB_SWITCH_TMU_MODE_LOWRES);

		} else {

			ret = tb_switch_tmu_configure(sw, TB_SWITCH_TMU_MODE_HIFI_BI);

		}



		/* If not supported, fallback to bi-directional HiFi */

		if (ret == -EOPNOTSUPP)

			ret = tb_switch_tmu_configure(sw, TB_SWITCH_TMU_MODE_HIFI_BI);

	}

	if (ret)

		return ret;

drivers/usb/core/usb-acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -170,11 +170,11 @@ static int usb_acpi_add_usb4_devlink(struct usb_device *udev) 
	struct fwnode_handle *nhi_fwnode __free(fwnode_handle) =

		fwnode_find_reference(dev_fwnode(&port_dev->dev), "usb4-host-interface", 0);



	if (IS_ERR(nhi_fwnode))

	if (IS_ERR(nhi_fwnode) || !nhi_fwnode->dev)

		return 0;



	link = device_link_add(&port_dev->child->dev, nhi_fwnode->dev,

			       DL_FLAG_AUTOREMOVE_CONSUMER |

			       DL_FLAG_STATELESS |

			       DL_FLAG_RPM_ACTIVE |

			       DL_FLAG_PM_RUNTIME);

	if (!link) {

drivers/usb/dwc2/params.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ static void dwc2_set_bcm_params(struct dwc2_hsotg *hsotg) 
	p->max_transfer_size = 65535;

	p->max_packet_count = 511;

	p->ahbcfg = 0x10;

	p->no_clock_gating = true;

}



static void dwc2_set_his_params(struct dwc2_hsotg *hsotg)

drivers/usb/host/xhci-pci.c

+4 −2
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ int xhci_pci_common_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	pm_runtime_put_noidle(&dev->dev);



	if (pci_choose_state(dev, PMSG_SUSPEND) == PCI_D0)

		pm_runtime_forbid(&dev->dev);

		pm_runtime_get(&dev->dev);

	else if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)

		pm_runtime_allow(&dev->dev);
@@ -683,7 +683,9 @@ void xhci_pci_remove(struct pci_dev *dev) 


	xhci->xhc_state |= XHCI_STATE_REMOVING;



	if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)

	if (pci_choose_state(dev, PMSG_SUSPEND) == PCI_D0)

		pm_runtime_put(&dev->dev);

	else if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)

		pm_runtime_forbid(&dev->dev);



	if (xhci->shared_hcd) {