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

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

Pull USB driver fixes from Greg KH:
 "Here are some small USB driver fixes and new device ids for 6.12-rc4:

   - xhci driver fixes for a number of reported issues

   - new usb-serial driver ids

   - dwc3 driver fixes for reported problems.

   - usb gadget driver fixes for reported problems

   - typec driver fixes

   - MAINTAINER file updates

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

* tag 'usb-6.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: serial: option: add Telit FN920C04 MBIM compositions
  USB: serial: option: add support for Quectel EG916Q-GL
  xhci: dbc: honor usb transfer size boundaries.
  usb: xhci: Fix handling errors mid TD followed by other errors
  xhci: Mitigate failed set dequeue pointer commands
  xhci: Fix incorrect stream context type macro
  USB: gadget: dummy-hcd: Fix "task hung" problem
  usb: gadget: f_uac2: fix return value for UAC2_ATTRIBUTE_STRING store
  usb: dwc3: core: Fix system suspend on TI AM62 platforms
  xhci: tegra: fix checked USB2 port number
  usb: dwc3: Wait for EndXfer completion before restoring GUSB2PHYCFG
  usb: typec: qcom-pmic-typec: fix sink status being overwritten with RP_DEF
  usb: typec: altmode should keep reference to parent
  MAINTAINERS: usb: raw-gadget: add bug tracker link
  MAINTAINERS: Add an entry for the LJCA drivers
parents db87114d 1154a599

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -11604,6 +11604,16 @@ F: drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c 
F:	drivers/crypto/intel/keembay/ocs-hcu.c

F:	drivers/crypto/intel/keembay/ocs-hcu.h









INTEL LA JOLLA COVE ADAPTER (LJCA) USB I/O EXPANDER DRIVERS









M:	Wentong Wu <wentong.wu@intel.com>









M:	Sakari Ailus <sakari.ailus@linux.intel.com>









S:	Maintained









F:	drivers/gpio/gpio-ljca.c









F:	drivers/i2c/busses/i2c-ljca.c









F:	drivers/spi/spi-ljca.c









F:	drivers/usb/misc/usb-ljca.c









F:	include/linux/usb/ljca.h

















INTEL MANAGEMENT ENGINE (mei)









M:	Tomas Winkler <tomas.winkler@intel.com>









L:	linux-kernel@vger.kernel.org








@@ -24078,6 +24088,7 @@ USB RAW GADGET DRIVER







R:	Andrey Konovalov <andreyknvl@gmail.com>









L:	linux-usb@vger.kernel.org









S:	Maintained









B:	https://github.com/xairy/raw-gadget/issues









F:	Documentation/usb/raw-gadget.rst









F:	drivers/usb/gadget/legacy/raw_gadget.c









F:	include/uapi/linux/usb/raw_gadget.h

























drivers/usb/dwc3/core.c



+19
−0






























Original line number
Diff line number
Diff line







@@ -2342,6 +2342,11 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)







	u32 reg;









	int i;



















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









			    DWC3_GUSB2PHYCFG_SUSPHY) ||









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









			    DWC3_GUSB3PIPECTL_SUSPHY);



















	switch (dwc->current_dr_role) {









	case DWC3_GCTL_PRTCAP_DEVICE:









		if (pm_runtime_suspended(dwc->dev))








@@ -2393,6 +2398,15 @@ 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;









}


















@@ -2460,6 +2474,11 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg)







		break;









	}



















	if (!PMSG_IS_AUTO(msg)) {









		/* restore SUSPHY state to that before system suspend. */









		dwc3_enable_susphy(dwc, dwc->susphy_state);









	}



















	return 0;









}










































drivers/usb/dwc3/core.h



+3
−0






























Original line number
Diff line number
Diff line







@@ -1150,6 +1150,8 @@ struct dwc3_scratchpad_array {







 * @sys_wakeup: set if the device may do system wakeup.









 * @wakeup_configured: set if the device is configured for remote wakeup.









 * @suspended: set to track suspend event due to U3/L2.









 * @susphy_state: state of DWC3_GUSB2PHYCFG_SUSPHY + DWC3_GUSB3PIPECTL_SUSPHY









 *		  before PM suspend.









 * @imod_interval: set the interrupt moderation interval in 250ns









 *			increments or 0 to disable.









 * @max_cfg_eps: current max number of IN eps used across all USB configs.








@@ -1382,6 +1384,7 @@ struct dwc3 {







	unsigned		sys_wakeup:1;









	unsigned		wakeup_configured:1;









	unsigned		suspended:1;









	unsigned		susphy_state:1;



















	u16			imod_interval;










































drivers/usb/dwc3/gadget.c



+6
−4






























Original line number
Diff line number
Diff line







@@ -438,6 +438,10 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd,







			dwc3_gadget_ep_get_transfer_index(dep);









	}



















	if (DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_ENDTRANSFER &&









	    !(cmd & DWC3_DEPCMD_CMDIOC))









		mdelay(1);



















	if (saved_config) {









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









		reg |= saved_config;








@@ -1715,12 +1719,10 @@ static int __dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force, bool int







	WARN_ON_ONCE(ret);









	dep->resource_index = 0;



















	if (!interrupt) {









		mdelay(1);









	if (!interrupt)









		dep->flags &= ~DWC3_EP_TRANSFER_STARTED;









	} else if (!ret) {









	else if (!ret)









		dep->flags |= DWC3_EP_END_TRANSFER_PENDING;









	}



















	dep->flags &= ~DWC3_EP_DELAY_STOP;









	return ret;
































drivers/usb/gadget/function/f_uac2.c



+3
−3






























Original line number
Diff line number
Diff line







@@ -2061,7 +2061,7 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item,	\







					  const char *page, size_t len)	\









{									\









	struct f_uac2_opts *opts = to_f_uac2_opts(item);		\









	int ret = 0;							\









	int ret = len;							\









									\









	mutex_lock(&opts->lock);					\









	if (opts->refcnt) {						\








@@ -2072,7 +2072,7 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item,	\







	if (len && page[len - 1] == '\n')				\









		len--;							\









									\









	ret = scnprintf(opts->name, min(sizeof(opts->name), len + 1),	\









	scnprintf(opts->name, min(sizeof(opts->name), len + 1),		\









		  "%s", page);						\









									\









end:									\