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

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

Pull USB fixes from Greg KH:
 "A few small USB fixes for 6.1-rc3. Include in here are:

   - MAINTAINERS update, including a big one for the USB gadget
     subsystem. Many thanks to Felipe for all of the years of hard work
     he has done on this codebase, it was greatly appreciated.

   - dwc3 driver fixes for reported problems.

   - xhci driver fixes for reported problems.

   - typec driver fixes for minor issues

   - uvc gadget driver change, and then revert as it wasn't relevant for
     6.1-final, as it is a new feature and people are still reviewing
     and modifying it.

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

* tag 'usb-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: dwc3: gadget: Don't set IMI for no_interrupt
  usb: dwc3: gadget: Stop processing more requests on IMI
  Revert "usb: gadget: uvc: limit isoc_sg to super speed gadgets"
  xhci: Remove device endpoints from bandwidth list when freeing the device
  xhci-pci: Set runtime PM as default policy on all xHC 1.2 or later devices
  xhci: Add quirk to reset host back to default state at shutdown
  usb: xhci: add XHCI_SPURIOUS_SUCCESS to ASM1042 despite being a V0.96 controller
  usb: dwc3: st: Rely on child's compatible instead of name
  usb: gadget: uvc: limit isoc_sg to super speed gadgets
  usb: bdc: change state when port disconnected
  usb: typec: ucsi: acpi: Implement resume callback
  usb: typec: ucsi: Check the connection on resume
  usb: gadget: aspeed: Fix probe regression
  usb: gadget: uvc: fix sg handling during video encode
  usb: gadget: uvc: fix sg handling in error case
  usb: gadget: uvc: fix dropped frame after missed isoc
  usb: dwc3: gadget: Don't delay End Transfer on delayed_status
  usb: dwc3: Don't switch OTG -> peripheral if extcon is present
  MAINTAINERS: Update maintainers for broadcom USB
  MAINTAINERS: move USB gadget and phy entries under the main USB entry
parents ef3c0949 308c316d

MAINTAINERS

+3 −16
Original line number Diff line number Diff line
@@ -4101,6 +4101,7 @@ N: bcm7038 
N:	bcm7120









BROADCOM BDC DRIVER









M:	Justin Chen <justinpopo6@gmail.com>









M:	Al Cooper <alcooperx@gmail.com>









L:	linux-usb@vger.kernel.org









R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>








@@ -4207,6 +4208,7 @@ F:	Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml







F:	drivers/tty/serial/8250/8250_bcm7271.c

















BROADCOM BRCMSTB USB EHCI DRIVER









M:	Justin Chen <justinpopo6@gmail.com>









M:	Al Cooper <alcooperx@gmail.com>









R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>









L:	linux-usb@vger.kernel.org








@@ -4223,6 +4225,7 @@ F:	Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml







F:	drivers/usb/misc/brcmstb-usb-pinmap.c

















BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER









M:	Justin Chen <justinpopo6@gmail.com>









M:	Al Cooper <alcooperx@gmail.com>









R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>









L:	linux-kernel@vger.kernel.org








@@ -21179,15 +21182,6 @@ S:	Maintained







F:	Documentation/usb/ehci.rst









F:	drivers/usb/host/ehci*

















USB GADGET/PERIPHERAL SUBSYSTEM









M:	Felipe Balbi <balbi@kernel.org>









L:	linux-usb@vger.kernel.org









S:	Maintained









W:	http://www.linux-usb.org/gadget









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git









F:	drivers/usb/gadget/









F:	include/linux/usb/gadget*

















USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)









M:	Jiri Kosina <jikos@kernel.org>









M:	Benjamin Tissoires <benjamin.tissoires@redhat.com>








@@ -21294,13 +21288,6 @@ W:	https://github.com/petkan/pegasus







T:	git https://github.com/petkan/pegasus.git









F:	drivers/net/usb/pegasus.*

















USB PHY LAYER









M:	Felipe Balbi <balbi@kernel.org>









L:	linux-usb@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git









F:	drivers/usb/phy/

















USB PRINTER DRIVER (usblp)









M:	Pete Zaitcev <zaitcev@redhat.com>









L:	linux-usb@vger.kernel.org

























drivers/usb/dwc3/core.c



+48
−1






























Original line number
Diff line number
Diff line







@@ -23,6 +23,7 @@







#include <linux/delay.h>









#include <linux/dma-mapping.h>









#include <linux/of.h>









#include <linux/of_graph.h>









#include <linux/acpi.h>









#include <linux/pinctrl/consumer.h>









#include <linux/reset.h>








@@ -85,7 +86,7 @@ static int dwc3_get_dr_mode(struct dwc3 *dwc)







		 * mode. If the controller supports DRD but the dr_mode is not









		 * specified or set to OTG, then set the mode to peripheral.









		 */









		if (mode == USB_DR_MODE_OTG &&









		if (mode == USB_DR_MODE_OTG && !dwc->edev &&









		    (!IS_ENABLED(CONFIG_USB_ROLE_SWITCH) ||









		     !device_property_read_bool(dwc->dev, "usb-role-switch")) &&









		    !DWC3_VER_IS_PRIOR(DWC3, 330A))








@@ -1690,6 +1691,46 @@ static void dwc3_check_params(struct dwc3 *dwc)







	}









}



















static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc)









{









	struct device *dev = dwc->dev;









	struct device_node *np_phy;









	struct extcon_dev *edev = NULL;









	const char *name;



















	if (device_property_read_bool(dev, "extcon"))









		return extcon_get_edev_by_phandle(dev, 0);



















	/*









	 * Device tree platforms should get extcon via phandle.









	 * On ACPI platforms, we get the name from a device property.









	 * This device property is for kernel internal use only and









	 * is expected to be set by the glue code.









	 */









	if (device_property_read_string(dev, "linux,extcon-name", &name) == 0)









		return extcon_get_extcon_dev(name);



















	/*









	 * 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









	 * error message from underlying code, as it's a valid case: extcon









	 * device (and "port" node) may be missing in case of "usb-role-switch"









	 * or OTG mode.









	 */









	np_phy = of_parse_phandle(dev->of_node, "phys", 0);









	if (of_graph_is_present(np_phy)) {









		struct device_node *np_conn;



















		np_conn = of_graph_get_remote_node(np_phy, -1, -1);









		if (np_conn)









			edev = extcon_find_edev_by_node(np_conn);









		of_node_put(np_conn);









	}









	of_node_put(np_phy);



















	return edev;









}



















static int dwc3_probe(struct platform_device *pdev)









{









	struct device		*dev = &pdev->dev;








@@ -1840,6 +1881,12 @@ static int dwc3_probe(struct platform_device *pdev)







		goto err2;









	}



















	dwc->edev = dwc3_get_extcon(dwc);









	if (IS_ERR(dwc->edev)) {









		ret = dev_err_probe(dwc->dev, PTR_ERR(dwc->edev), "failed to get extcon\n");









		goto err3;









	}



















	ret = dwc3_get_dr_mode(dwc);









	if (ret)









		goto err3;
































drivers/usb/dwc3/drd.c



+0
−50






























Original line number
Diff line number
Diff line







@@ -8,7 +8,6 @@







 */



















#include <linux/extcon.h>









#include <linux/of_graph.h>









#include <linux/of_platform.h>









#include <linux/platform_device.h>









#include <linux/property.h>








@@ -439,51 +438,6 @@ static int dwc3_drd_notifier(struct notifier_block *nb,







	return NOTIFY_DONE;









}



















static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc)









{









	struct device *dev = dwc->dev;









	struct device_node *np_phy;









	struct extcon_dev *edev = NULL;









	const char *name;



















	if (device_property_read_bool(dev, "extcon"))









		return extcon_get_edev_by_phandle(dev, 0);



















	/*









	 * Device tree platforms should get extcon via phandle.









	 * On ACPI platforms, we get the name from a device property.









	 * This device property is for kernel internal use only and









	 * is expected to be set by the glue code.









	 */









	if (device_property_read_string(dev, "linux,extcon-name", &name) == 0) {









		edev = extcon_get_extcon_dev(name);









		if (!edev)









			return ERR_PTR(-EPROBE_DEFER);



















		return edev;









	}



















	/*









	 * 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









	 * error message from underlying code, as it's a valid case: extcon









	 * device (and "port" node) may be missing in case of "usb-role-switch"









	 * or OTG mode.









	 */









	np_phy = of_parse_phandle(dev->of_node, "phys", 0);









	if (of_graph_is_present(np_phy)) {









		struct device_node *np_conn;



















		np_conn = of_graph_get_remote_node(np_phy, -1, -1);









		if (np_conn)









			edev = extcon_find_edev_by_node(np_conn);









		of_node_put(np_conn);









	}









	of_node_put(np_phy);



















	return edev;









}



















#if IS_ENABLED(CONFIG_USB_ROLE_SWITCH)









#define ROLE_SWITCH 1









static int dwc3_usb_role_switch_set(struct usb_role_switch *sw,








@@ -588,10 +542,6 @@ int dwc3_drd_init(struct dwc3 *dwc)







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









		return dwc3_setup_role_switch(dwc);



















	dwc->edev = dwc3_get_extcon(dwc);









	if (IS_ERR(dwc->edev))









		return PTR_ERR(dwc->edev);



















	if (dwc->edev) {









		dwc->edev_nb.notifier_call = dwc3_drd_notifier;









		ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST,
































drivers/usb/dwc3/dwc3-st.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -251,7 +251,7 @@ static int st_dwc3_probe(struct platform_device *pdev)







	/* Manage SoftReset */









	reset_control_deassert(dwc3_data->rstc_rst);



















	child = of_get_child_by_name(node, "usb");









	child = of_get_compatible_child(node, "snps,dwc3");









	if (!child) {









		dev_err(&pdev->dev, "failed to find dwc3 core node\n");









		ret = -ENODEV;
































drivers/usb/dwc3/gadget.c



+17
−3






























Original line number
Diff line number
Diff line







@@ -1292,7 +1292,7 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,







			trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS;









		}



















		/* always enable Interrupt on Missed ISOC */









		if (!no_interrupt && !chain)









			trb->ctrl |= DWC3_TRB_CTRL_ISP_IMI;









		break;


















@@ -1698,6 +1698,16 @@ static int __dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force, bool int







	cmd |= DWC3_DEPCMD_PARAM(dep->resource_index);









	memset(&params, 0, sizeof(params));









	ret = dwc3_send_gadget_ep_cmd(dep, cmd, &params);









	/*









	 * If the End Transfer command was timed out while the device is









	 * not in SETUP phase, it's possible that an incoming Setup packet









	 * may prevent the command's completion. Let's retry when the









	 * ep0state returns to EP0_SETUP_PHASE.









	 */









	if (ret == -ETIMEDOUT && dep->dwc->ep0state != EP0_SETUP_PHASE) {









		dep->flags |= DWC3_EP_DELAY_STOP;









		return 0;









	}









	WARN_ON_ONCE(ret);









	dep->resource_index = 0;


















@@ -3238,6 +3248,10 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep,







	if (event->status & DEPEVT_STATUS_SHORT && !chain)









		return 1;



















	if ((trb->ctrl & DWC3_TRB_CTRL_ISP_IMI) &&









	    DWC3_TRB_SIZE_TRBSTS(trb->size) == DWC3_TRBSTS_MISSED_ISOC)









		return 1;



















	if ((trb->ctrl & DWC3_TRB_CTRL_IOC) ||









	    (trb->ctrl & DWC3_TRB_CTRL_LST))









		return 1;








@@ -3719,7 +3733,7 @@ void dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force,







	 * timeout. Delay issuing the End Transfer command until the Setup TRB is









	 * prepared.









	 */









	if (dwc->ep0state != EP0_SETUP_PHASE) {









	if (dwc->ep0state != EP0_SETUP_PHASE && !dwc->delayed_status) {









		dep->flags |= DWC3_EP_DELAY_STOP;









		return;









	}