Commit 950a9f56 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB driver fixes from Greg KH:
 "Here are a number of USB driver fixes and new device ids for 6.1-rc6.
  Included in here are:

   - new usb-serial device ids

   - dwc3 driver fixes for reported problems

   - cdns3 driver fixes

   - new USB device quirks

   - typec driver fixes

   - extcon USB typec driver fix

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

* tag 'usb-6.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: serial: option: add u-blox LARA-L6 modem
  USB: serial: option: add u-blox LARA-R6 00B modem
  USB: serial: option: remove old LARA-R6 PID
  USB: serial: option: add Fibocom FM160 0x0111 composition
  usb: add NO_LPM quirk for Realforce 87U Keyboard
  usb: cdns3: host: fix endless superspeed hub port reset
  usb: chipidea: fix deadlock in ci_otg_del_timer
  usb: dwc3: Do not get extcon device when usb-role-switch is used
  usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler
  usb: typec: mux: Enter safe mode only when pins need to be reconfigured
  extcon: usbc-tusb320: Call the Type-C IRQ handler only if a port is registered
  Revert "usb: dwc3: disable USB core PHY management"
  usb: dwc3: gadget: Return -ESHUTDOWN on ep disable
  USB: bcma: Make GPIO explicitly optional
  USB: serial: option: add Sierra Wireless EM9191
parents 12fe29ee 59a51183

drivers/extcon/extcon-usbc-tusb320.c

+7 −1
Original line number Diff line number Diff line
@@ -327,6 +327,12 @@ static irqreturn_t tusb320_irq_handler(int irq, void *dev_id) 
		return IRQ_NONE;



	tusb320_extcon_irq_handler(priv, reg);



	/*

	 * Type-C support is optional. Only call the Type-C handler if a

	 * port had been registered previously.

	 */

	if (priv->port)

		tusb320_typec_irq_handler(priv, reg);



	regmap_write(priv->regmap, TUSB320_REG9, reg);

drivers/usb/cdns3/host.c

+28 −28
Original line number Diff line number Diff line
@@ -24,11 +24,37 @@ 
#define CFG_RXDET_P3_EN		BIT(15)

#define LPM_2_STB_SWITCH_EN	BIT(25)



static int xhci_cdns3_suspend_quirk(struct usb_hcd *hcd);

static void xhci_cdns3_plat_start(struct usb_hcd *hcd)

{

	struct xhci_hcd *xhci = hcd_to_xhci(hcd);

	u32 value;



	/* set usbcmd.EU3S */

	value = readl(&xhci->op_regs->command);

	value |= CMD_PM_INDEX;

	writel(value, &xhci->op_regs->command);



	if (hcd->regs) {

		value = readl(hcd->regs + XECP_AUX_CTRL_REG1);

		value |= CFG_RXDET_P3_EN;

		writel(value, hcd->regs + XECP_AUX_CTRL_REG1);



		value = readl(hcd->regs + XECP_PORT_CAP_REG);

		value |= LPM_2_STB_SWITCH_EN;

		writel(value, hcd->regs + XECP_PORT_CAP_REG);

	}

}



static int xhci_cdns3_resume_quirk(struct usb_hcd *hcd)

{

	xhci_cdns3_plat_start(hcd);

	return 0;

}



static const struct xhci_plat_priv xhci_plat_cdns3_xhci = {

	.quirks = XHCI_SKIP_PHY_INIT | XHCI_AVOID_BEI,

	.suspend_quirk = xhci_cdns3_suspend_quirk,

	.plat_start = xhci_cdns3_plat_start,

	.resume_quirk = xhci_cdns3_resume_quirk,

};



static int __cdns_host_init(struct cdns *cdns)
@@ -90,32 +116,6 @@ static int __cdns_host_init(struct cdns *cdns) 
	return ret;

}



static int xhci_cdns3_suspend_quirk(struct usb_hcd *hcd)

{

	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);

	u32 value;



	if (pm_runtime_status_suspended(hcd->self.controller))

		return 0;



	/* set usbcmd.EU3S */

	value = readl(&xhci->op_regs->command);

	value |= CMD_PM_INDEX;

	writel(value, &xhci->op_regs->command);



	if (hcd->regs) {

		value = readl(hcd->regs + XECP_AUX_CTRL_REG1);

		value |= CFG_RXDET_P3_EN;

		writel(value, hcd->regs + XECP_AUX_CTRL_REG1);



		value = readl(hcd->regs + XECP_PORT_CAP_REG);

		value |= LPM_2_STB_SWITCH_EN;

		writel(value, hcd->regs + XECP_PORT_CAP_REG);

	}



	return 0;

}



static void cdns_host_exit(struct cdns *cdns)

{

	kfree(cdns->xhci_plat_data);

drivers/usb/chipidea/otg_fsm.c

+2 −0
Original line number Diff line number Diff line
@@ -256,8 +256,10 @@ static void ci_otg_del_timer(struct ci_hdrc *ci, enum otg_fsm_timer t) 
	ci->enabled_otg_timer_bits &= ~(1 << t);

	if (ci->next_otg_timer == t) {

		if (ci->enabled_otg_timer_bits == 0) {

			spin_unlock_irqrestore(&ci->lock, flags);

			/* No enabled timers after delete it */

			hrtimer_cancel(&ci->otg_fsm_hrtimer);

			spin_lock_irqsave(&ci->lock, flags);

			ci->next_otg_timer = NUM_OTG_FSM_TIMERS;

		} else {

			/* Find the next timer */

drivers/usb/core/quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -362,6 +362,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	{ USB_DEVICE(0x0781, 0x5583), .driver_info = USB_QUIRK_NO_LPM },

	{ USB_DEVICE(0x0781, 0x5591), .driver_info = USB_QUIRK_NO_LPM },



	/* Realforce 87U Keyboard */

	{ USB_DEVICE(0x0853, 0x011b), .driver_info = USB_QUIRK_NO_LPM },



	/* M-Systems Flash Disk Pioneers */

	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },

drivers/usb/dwc3/core.c

+10 −0
Original line number Diff line number Diff line
@@ -1710,6 +1710,16 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc) 
	if (device_property_read_string(dev, "linux,extcon-name", &name) == 0)

		return extcon_get_extcon_dev(name);



	/*

	 * Check explicitly if "usb-role-switch" is used since

	 * extcon_find_edev_by_node() can not be used to check the absence of

	 * an extcon device. In the absence of an device it will always return

	 * EPROBE_DEFER.

	 */

	if (IS_ENABLED(CONFIG_USB_ROLE_SWITCH) &&

	    device_property_read_bool(dev, "usb-role-switch"))

		return NULL;



	/*

	 * Try to get an extcon device from the USB PHY controller's "port"

	 * node. Check if it has the "port" node first, to avoid printing the