Commit 88f66f13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are a set of USB driver fixes for 6.5-rc4. Include in here are:

   - new USB serial device ids

   - dwc3 driver fixes for reported issues

   - typec driver fixes for reported problems

   - gadget driver fixes

   - reverts of some problematic USB changes that went into -rc1

  All of these have been in linux-next with no reported problems"

* tag 'usb-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (24 commits)
  usb: misc: ehset: fix wrong if condition
  usb: dwc3: pci: skip BYT GPIO lookup table for hardwired phy
  usb: cdns3: fix incorrect calculation of ep_buf_size when more than one config
  usb: gadget: call usb_gadget_check_config() to verify UDC capability
  usb: typec: Use sysfs_emit_at when concatenating the string
  usb: typec: Iterate pds array when showing the pd list
  usb: typec: Set port->pd before adding device for typec_port
  usb: typec: qcom: fix return value check in qcom_pmic_typec_probe()
  Revert "usb: gadget: tegra-xudc: Fix error check in tegra_xudc_powerdomain_init()"
  Revert "usb: xhci: tegra: Fix error check"
  USB: gadget: Fix the memory leak in raw_gadget driver
  usb: gadget: core: remove unbalanced mutex_unlock in usb_gadget_activate
  Revert "usb: dwc3: core: Enable AutoRetry feature in the controller"
  Revert "xhci: add quirk for host controllers that don't update endpoint DCS"
  USB: quirks: add quirk for Focusrite Scarlett
  usb: xhci-mtk: set the dma max_seg_size
  MAINTAINERS: drop invalid usb/cdns3 Reviewer e-mail
  usb: dwc3: don't reset device side if dwc3 was configured as host-only
  usb: typec: ucsi: move typec_set_mode(TYPEC_STATE_SAFE) to ucsi_unregister_partner()
  usb: ohci-at91: Fix the unhandle interrupt when resume
  ...
parents e6d34ced 7f232766

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -4463,7 +4463,6 @@ CADENCE USB3 DRD IP DRIVER 
M:	Peter Chen <peter.chen@kernel.org>

M:	Pawel Laszczak <pawell@cadence.com>

R:	Roger Quadros <rogerq@kernel.org>

R:	Aswath Govindraju <a-govindraju@ti.com>

L:	linux-usb@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git

drivers/usb/cdns3/cdns3-gadget.c

+3 −1
Original line number Diff line number Diff line
@@ -3015,12 +3015,14 @@ static int cdns3_gadget_udc_stop(struct usb_gadget *gadget) 
static int cdns3_gadget_check_config(struct usb_gadget *gadget)

{

	struct cdns3_device *priv_dev = gadget_to_cdns3_device(gadget);

	struct cdns3_endpoint *priv_ep;

	struct usb_ep *ep;

	int n_in = 0;

	int total;



	list_for_each_entry(ep, &gadget->ep_list, ep_list) {

		if (ep->claimed && (ep->address & USB_DIR_IN))

		priv_ep = ep_to_cdns3_ep(ep);

		if ((priv_ep->flags & EP_CLAIMED) && (ep->address & USB_DIR_IN))

			n_in++;

	}

drivers/usb/core/quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -436,6 +436,10 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* novation SoundControl XL */

	{ USB_DEVICE(0x1235, 0x0061), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Focusrite Scarlett Solo USB */

	{ USB_DEVICE(0x1235, 0x8211), .driver_info =

			USB_QUIRK_DISCONNECT_SUSPEND },



	/* Huawei 4G LTE module */

	{ USB_DEVICE(0x12d1, 0x15bb), .driver_info =

			USB_QUIRK_DISCONNECT_SUSPEND },

drivers/usb/dwc3/core.c

+2 −18
Original line number Diff line number Diff line
@@ -277,9 +277,9 @@ int dwc3_core_soft_reset(struct dwc3 *dwc) 
	/*

	 * We're resetting only the device side because, if we're in host mode,

	 * XHCI driver will reset the host block. If dwc3 was configured for

	 * host-only mode, then we can return early.

	 * host-only mode or current role is host, then we can return early.

	 */

	if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST)

	if (dwc->dr_mode == USB_DR_MODE_HOST || dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST)

		return 0;



	reg = dwc3_readl(dwc->regs, DWC3_DCTL);
@@ -1209,22 +1209,6 @@ static int dwc3_core_init(struct dwc3 *dwc) 
		dwc3_writel(dwc->regs, DWC3_GUCTL1, reg);

	}



	if (dwc->dr_mode == USB_DR_MODE_HOST ||

	    dwc->dr_mode == USB_DR_MODE_OTG) {

		reg = dwc3_readl(dwc->regs, DWC3_GUCTL);



		/*

		 * Enable Auto retry Feature to make the controller operating in

		 * Host mode on seeing transaction errors(CRC errors or internal

		 * overrun scenerios) on IN transfers to reply to the device

		 * with a non-terminating retry ACK (i.e, an ACK transcation

		 * packet with Retry=1 & Nump != 0)

		 */

		reg |= DWC3_GUCTL_HSTINAUTORETRY;



		dwc3_writel(dwc->regs, DWC3_GUCTL, reg);

	}



	/*

	 * Must config both number of packets and max burst settings to enable

	 * RX and/or TX threshold.

drivers/usb/dwc3/core.h

+0 −3
Original line number Diff line number Diff line
@@ -256,9 +256,6 @@ 
#define DWC3_GCTL_GBLHIBERNATIONEN	BIT(1)

#define DWC3_GCTL_DSBLCLKGTNG		BIT(0)



/* Global User Control Register */

#define DWC3_GUCTL_HSTINAUTORETRY	BIT(14)



/* Global User Control 1 Register */

#define DWC3_GUCTL1_DEV_DECOUPLE_L1L2_EVT	BIT(31)

#define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS	BIT(28)