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

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

Pull USB/Thunderbolt fixes from Greg KH:
 "Here are some small remaining USB and Thunderbolt fixes and device ids
  for 6.12-rc7. Included in here are:

   - new USB serial driver device ids

   - thunderbolt driver fixes for reported problems

   - typec bugfixes

   - dwc3 driver fix

   - musb driver fix

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

* tag 'usb-6.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: serial: qcserial: add support for Sierra Wireless EM86xx
  thunderbolt: Fix connection issue with Pluggable UD-4VPD dock
  usb: typec: fix potential out of bounds in ucsi_ccg_update_set_new_cam_cmd()
  usb: dwc3: fix fault at system suspend if device was already runtime suspended
  usb: typec: qcom-pmic: init value of hdr_len/txbuf_len earlier
  usb: musb: sunxi: Fix accessing an released usb phy
  USB: serial: io_edgeport: fix use after free in debug printk
  USB: serial: option: add Quectel RG650V
  USB: serial: option: add Fibocom FG132 0x0112 composition
  thunderbolt: Add only on-board retimers when !CONFIG_USB4_DEBUGFS_MARGINING
parents 023d4fc0 742afcc2

drivers/thunderbolt/retimer.c

+2 −0
Original line number Diff line number Diff line
@@ -532,6 +532,8 @@ int tb_retimer_scan(struct tb_port *port, bool add) 
	}



	ret = 0;

	if (!IS_ENABLED(CONFIG_USB4_DEBUGFS_MARGINING))

		max = min(last_idx, max);



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

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

drivers/thunderbolt/usb4.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ enum usb4_ba_index { 


/* Delays in us used with usb4_port_wait_for_bit() */

#define USB4_PORT_DELAY			50

#define USB4_PORT_SB_DELAY		5000

#define USB4_PORT_SB_DELAY		1000



static int usb4_native_switch_op(struct tb_switch *sw, u16 opcode,

				 u32 *metadata, u8 *status,

drivers/usb/dwc3/core.c

+12 −13
Original line number Diff line number Diff line
@@ -2342,10 +2342,18 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) 
	u32 reg;

	int i;



	if (!pm_runtime_suspended(dwc->dev) && !PMSG_IS_AUTO(msg)) {

		dwc->susphy_state = (dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)) &

				    DWC3_GUSB2PHYCFG_SUSPHY) ||

				    (dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)) &

				    DWC3_GUSB3PIPECTL_SUSPHY);

		/*

		 * TI AM62 platform requires SUSPHY to be

		 * enabled for system suspend to work.

		 */

		if (!dwc->susphy_state)

			dwc3_enable_susphy(dwc, true);

	}



	switch (dwc->current_dr_role) {

	case DWC3_GCTL_PRTCAP_DEVICE:
@@ -2398,15 +2406,6 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) 
		break;

	}



	if (!PMSG_IS_AUTO(msg)) {

		/*

		 * TI AM62 platform requires SUSPHY to be

		 * enabled for system suspend to work.

		 */

		if (!dwc->susphy_state)

			dwc3_enable_susphy(dwc, true);

	}



	return 0;

}

drivers/usb/musb/sunxi.c

+0 −2
Original line number Diff line number Diff line
@@ -293,8 +293,6 @@ static int sunxi_musb_exit(struct musb *musb) 
	if (test_bit(SUNXI_MUSB_FL_HAS_SRAM, &glue->flags))

		sunxi_sram_release(musb->controller->parent);



	devm_usb_put_phy(glue->dev, glue->xceiv);



	return 0;

}

drivers/usb/serial/io_edgeport.c

+4 −4
Original line number Diff line number Diff line
@@ -770,11 +770,12 @@ static void edge_bulk_out_data_callback(struct urb *urb) 
static void edge_bulk_out_cmd_callback(struct urb *urb)

{

	struct edgeport_port *edge_port = urb->context;

	struct device *dev = &urb->dev->dev;

	int status = urb->status;



	atomic_dec(&CmdUrbs);

	dev_dbg(&urb->dev->dev, "%s - FREE URB %p (outstanding %d)\n",

		__func__, urb, atomic_read(&CmdUrbs));

	dev_dbg(dev, "%s - FREE URB %p (outstanding %d)\n", __func__, urb,

		atomic_read(&CmdUrbs));





	/* clean up the transfer buffer */
@@ -784,8 +785,7 @@ static void edge_bulk_out_cmd_callback(struct urb *urb) 
	usb_free_urb(urb);



	if (status) {

		dev_dbg(&urb->dev->dev,

			"%s - nonzero write bulk status received: %d\n",

		dev_dbg(dev, "%s - nonzero write bulk status received: %d\n",

			__func__, status);

		return;

	}