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

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

Pull USB fixes from Greg KH:
 "Here are some small USB fixes for some reported problems for 6.12-rc3.
  Include in here is:

   - fix for yurex driver that was caused in -rc1

   - build error fix for usbg network filesystem code

   - onboard_usb_dev build fix

   - dwc3 driver fixes for reported errors

   - gadget driver fix

   - new USB storage driver quirk

   - xhci resume bugfix

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

* tag 'usb-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  net/9p/usbg: Fix build error
  USB: yurex: kill needless initialization in yurex_read
  Revert "usb: yurex: Replace snprintf() with the safer scnprintf() variant"
  usb: xhci: Fix problem with xhci resume from suspend
  usb: misc: onboard_usb_dev: introduce new config symbol for usb5744 SMBus support
  usb: dwc3: core: Stop processing of pending events if controller is halted
  usb: dwc3: re-enable runtime PM after failed resume
  usb: storage: ignore bogus device raised by JieLi BR21 USB sound chip
  usb: gadget: core: force synchronous registration
parents f683c9b1 faa34159

drivers/usb/dwc3/core.c

+22 −8
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ static int dwc3_alloc_event_buffers(struct dwc3 *dwc, unsigned int length) 
int dwc3_event_buffers_setup(struct dwc3 *dwc)

{

	struct dwc3_event_buffer	*evt;

	u32				reg;



	if (!dwc->ev_buf)

		return 0;
@@ -556,8 +557,10 @@ int dwc3_event_buffers_setup(struct dwc3 *dwc) 
			upper_32_bits(evt->dma));

	dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0),

			DWC3_GEVNTSIZ_SIZE(evt->length));

	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), 0);



	/* Clear any stale event */

	reg = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));

	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), reg);

	return 0;

}
@@ -584,7 +587,10 @@ void dwc3_event_buffers_cleanup(struct dwc3 *dwc) 
	dwc3_writel(dwc->regs, DWC3_GEVNTADRHI(0), 0);

	dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0), DWC3_GEVNTSIZ_INTMASK

			| DWC3_GEVNTSIZ_SIZE(0));

	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), 0);



	/* Clear any stale event */

	reg = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));

	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), reg);

}



static void dwc3_core_num_eps(struct dwc3 *dwc)
@@ -2499,7 +2505,11 @@ static int dwc3_runtime_resume(struct device *dev) 


	switch (dwc->current_dr_role) {

	case DWC3_GCTL_PRTCAP_DEVICE:

		dwc3_gadget_process_pending_events(dwc);

		if (dwc->pending_events) {

			pm_runtime_put(dwc->dev);

			dwc->pending_events = false;

			enable_irq(dwc->irq_gadget);

		}

		break;

	case DWC3_GCTL_PRTCAP_HOST:

	default:
@@ -2552,7 +2562,7 @@ static int dwc3_suspend(struct device *dev) 
static int dwc3_resume(struct device *dev)

{

	struct dwc3	*dwc = dev_get_drvdata(dev);

	int		ret;

	int		ret = 0;



	pinctrl_pm_select_default_state(dev);
@@ -2560,14 +2570,12 @@ static int dwc3_resume(struct device *dev) 
	pm_runtime_set_active(dev);



	ret = dwc3_resume_common(dwc, PMSG_RESUME);

	if (ret) {

	if (ret)

		pm_runtime_set_suspended(dev);

		return ret;

	}



	pm_runtime_enable(dev);



	return 0;

	return ret;

}



static void dwc3_complete(struct device *dev)
@@ -2589,6 +2597,12 @@ static void dwc3_complete(struct device *dev) 
static const struct dev_pm_ops dwc3_dev_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(dwc3_suspend, dwc3_resume)

	.complete = dwc3_complete,



	/*

	 * Runtime suspend halts the controller on disconnection. It relies on

	 * platforms with custom connection notification to start the controller

	 * again.

	 */

	SET_RUNTIME_PM_OPS(dwc3_runtime_suspend, dwc3_runtime_resume,

			dwc3_runtime_idle)

};

drivers/usb/dwc3/core.h

+0 −4
Original line number Diff line number Diff line
@@ -1675,7 +1675,6 @@ static inline void dwc3_otg_host_init(struct dwc3 *dwc) 
#if !IS_ENABLED(CONFIG_USB_DWC3_HOST)

int dwc3_gadget_suspend(struct dwc3 *dwc);

int dwc3_gadget_resume(struct dwc3 *dwc);

void dwc3_gadget_process_pending_events(struct dwc3 *dwc);

#else

static inline int dwc3_gadget_suspend(struct dwc3 *dwc)

{
@@ -1687,9 +1686,6 @@ static inline int dwc3_gadget_resume(struct dwc3 *dwc) 
	return 0;

}



static inline void dwc3_gadget_process_pending_events(struct dwc3 *dwc)

{

}

#endif /* !IS_ENABLED(CONFIG_USB_DWC3_HOST) */



#if IS_ENABLED(CONFIG_USB_DWC3_ULPI)

drivers/usb/dwc3/gadget.c

+0 −11
Original line number Diff line number Diff line
@@ -4728,14 +4728,3 @@ int dwc3_gadget_resume(struct dwc3 *dwc) 


	return dwc3_gadget_soft_connect(dwc);

}
 


void dwc3_gadget_process_pending_events(struct dwc3 *dwc)

{

	if (dwc->pending_events) {

		dwc3_interrupt(dwc->irq_gadget, dwc->ev_buf);

		dwc3_thread_interrupt(dwc->irq_gadget, dwc->ev_buf);

		pm_runtime_put(dwc->dev);

		dwc->pending_events = false;

		enable_irq(dwc->irq_gadget);

	}

}

drivers/usb/gadget/udc/core.c

+1 −0
Original line number Diff line number Diff line
@@ -1696,6 +1696,7 @@ int usb_gadget_register_driver_owner(struct usb_gadget_driver *driver, 
	driver->driver.bus = &gadget_bus_type;

	driver->driver.owner = owner;

	driver->driver.mod_name = mod_name;

	driver->driver.probe_type = PROBE_FORCE_SYNCHRONOUS;

	ret = driver_register(&driver->driver);

	if (ret) {

		pr_warn("%s: driver registration failed: %d\n",

drivers/usb/host/xhci-pci.c

+5 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
#define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI		0x1142

#define PCI_DEVICE_ID_ASMEDIA_1142_XHCI			0x1242

#define PCI_DEVICE_ID_ASMEDIA_2142_XHCI			0x2142

#define PCI_DEVICE_ID_ASMEDIA_3042_XHCI			0x3042

#define PCI_DEVICE_ID_ASMEDIA_3242_XHCI			0x3242



#define PCI_DEVICE_ID_CADENCE				0x17CD
@@ -451,6 +452,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI)

		xhci->quirks |= XHCI_ASMEDIA_MODIFY_FLOWCONTROL;



	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&

	    pdev->device == PCI_DEVICE_ID_ASMEDIA_3042_XHCI)

		xhci->quirks |= XHCI_RESET_ON_RESUME;



	if (pdev->vendor == PCI_VENDOR_ID_TI && pdev->device == 0x8241)

		xhci->quirks |= XHCI_LIMIT_ENDPOINT_INTERVAL_7;