Commit 4a668429 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-5.13-rc2' 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 5.13-rc2. They consist of a number
  of resolutions for reported issues:

   - typec fixes for found problems

   - xhci fixes and quirk additions

   - dwc3 driver fixes

   - minor fixes found by Coverity

   - cdc-wdm fixes for reported problems

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

* tag 'usb-5.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (28 commits)
  usb: core: hub: fix race condition about TRSMRCY of resume
  usb: typec: tcpm: Fix SINK_DISCOVERY current limit for Rp-default
  xhci: Add reset resume quirk for AMD xhci controller.
  usb: xhci: Increase timeout for HC halt
  xhci: Do not use GFP_KERNEL in (potentially) atomic context
  xhci: Fix giving back cancelled URBs even if halted endpoint can't reset
  xhci-pci: Allow host runtime PM as default for Intel Alder Lake xHCI
  usb: musb: Fix an error message
  usb: typec: tcpm: Fix wrong handling for Not_Supported in VDM AMS
  usb: typec: tcpm: Send DISCOVER_IDENTITY from dedicated work
  usb: typec: ucsi: Retrieve all the PDOs instead of just the first 4
  usb: fotg210-hcd: Fix an error message
  docs: usb: function: Modify path name
  usb: dwc3: omap: improve extcon initialization
  usb: typec: ucsi: Put fwnode in any case during ->probe()
  usb: typec: tcpm: Fix wrong handling in GET_SINK_CAP
  usb: dwc2: Remove obsolete MODULE_ constants from platform.c
  usb: dwc3: imx8mp: fix error return code in dwc3_imx8mp_probe()
  usb: dwc3: imx8mp: detect dwc3 core node via compatible string
  usb: dwc3: gadget: Return success always for kick transfer in ep queue
  ...
parents 8ce36481 975f94c7

Documentation/driver-api/usb/usb.rst

+9 −6
Original line number Diff line number Diff line
@@ -109,16 +109,19 @@ well as to make sure they aren't relying on some HCD-specific behavior. 
USB-Standard Types

==================



In ``drivers/usb/common/common.c`` and ``drivers/usb/common/debug.c`` you

will find the USB data types defined in chapter 9 of the USB specification.

These data types are used throughout USB, and in APIs including this host

side API, gadget APIs, usb character devices and debugfs interfaces.

In ``include/uapi/linux/usb/ch9.h`` you will find the USB data types defined

in chapter 9 of the USB specification. These data types are used throughout

USB, and in APIs including this host side API, gadget APIs, usb character

devices and debugfs interfaces. That file is itself included by

``include/linux/usb/ch9.h``, which also contains declarations of a few

utility routines for manipulating these data types; the implementations

are in ``drivers/usb/common/common.c``.



.. kernel-doc:: drivers/usb/common/common.c

   :export:



.. kernel-doc:: drivers/usb/common/debug.c

   :export:

In addition, some functions useful for creating debugging output are

defined in ``drivers/usb/common/debug.c``.



Host-Side Data Types and Macros

===============================

Documentation/usb/gadget_configfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ is an arbitrary string allowed in a filesystem, e.g.:: 
Each function provides its specific set of attributes, with either read-only

or read-write access. Where applicable they need to be written to as

appropriate.

Please refer to Documentation/ABI/*/configfs-usb-gadget* for more information.

Please refer to Documentation/ABI/testing/configfs-usb-gadget for more information.



4. Associating the functions with their configurations

------------------------------------------------------

drivers/usb/class/cdc-wdm.c

+22 −8
Original line number Diff line number Diff line
@@ -321,12 +321,23 @@ static void wdm_int_callback(struct urb *urb) 


}



static void kill_urbs(struct wdm_device *desc)

static void poison_urbs(struct wdm_device *desc)

{

	/* the order here is essential */

	usb_kill_urb(desc->command);

	usb_kill_urb(desc->validity);

	usb_kill_urb(desc->response);

	usb_poison_urb(desc->command);

	usb_poison_urb(desc->validity);

	usb_poison_urb(desc->response);

}



static void unpoison_urbs(struct wdm_device *desc)

{

	/*

	 *  the order here is not essential

	 *  it is symmetrical just to be nice

	 */

	usb_unpoison_urb(desc->response);

	usb_unpoison_urb(desc->validity);

	usb_unpoison_urb(desc->command);

}



static void free_urbs(struct wdm_device *desc)
@@ -741,11 +752,12 @@ static int wdm_release(struct inode *inode, struct file *file) 
	if (!desc->count) {

		if (!test_bit(WDM_DISCONNECTING, &desc->flags)) {

			dev_dbg(&desc->intf->dev, "wdm_release: cleanup\n");

			kill_urbs(desc);

			poison_urbs(desc);

			spin_lock_irq(&desc->iuspin);

			desc->resp_count = 0;

			spin_unlock_irq(&desc->iuspin);

			desc->manage_power(desc->intf, 0);

			unpoison_urbs(desc);

		} else {

			/* must avoid dev_printk here as desc->intf is invalid */

			pr_debug(KBUILD_MODNAME " %s: device gone - cleaning up\n", __func__);
@@ -1037,9 +1049,9 @@ static void wdm_disconnect(struct usb_interface *intf) 
	wake_up_all(&desc->wait);

	mutex_lock(&desc->rlock);

	mutex_lock(&desc->wlock);

	poison_urbs(desc);

	cancel_work_sync(&desc->rxwork);

	cancel_work_sync(&desc->service_outs_intr);

	kill_urbs(desc);

	mutex_unlock(&desc->wlock);

	mutex_unlock(&desc->rlock);
@@ -1080,9 +1092,10 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message) 
		set_bit(WDM_SUSPENDING, &desc->flags);

		spin_unlock_irq(&desc->iuspin);

		/* callback submits work - order is essential */

		kill_urbs(desc);

		poison_urbs(desc);

		cancel_work_sync(&desc->rxwork);

		cancel_work_sync(&desc->service_outs_intr);

		unpoison_urbs(desc);

	}

	if (!PMSG_IS_AUTO(message)) {

		mutex_unlock(&desc->wlock);
@@ -1140,7 +1153,7 @@ static int wdm_pre_reset(struct usb_interface *intf) 
	wake_up_all(&desc->wait);

	mutex_lock(&desc->rlock);

	mutex_lock(&desc->wlock);

	kill_urbs(desc);

	poison_urbs(desc);

	cancel_work_sync(&desc->rxwork);

	cancel_work_sync(&desc->service_outs_intr);

	return 0;
@@ -1151,6 +1164,7 @@ static int wdm_post_reset(struct usb_interface *intf) 
	struct wdm_device *desc = wdm_find_device(intf);

	int rv;



	unpoison_urbs(desc);

	clear_bit(WDM_OVERFLOW, &desc->flags);

	clear_bit(WDM_RESETTING, &desc->flags);

	rv = recover_from_urb_loss(desc);

drivers/usb/core/hub.c

+3 −3
Original line number Diff line number Diff line
@@ -3642,9 +3642,6 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) 
		 * sequence.

		 */

		status = hub_port_status(hub, port1, &portstatus, &portchange);



		/* TRSMRCY = 10 msec */

		msleep(10);

	}



 SuspendCleared:
@@ -3659,6 +3656,9 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) 
				usb_clear_port_feature(hub->hdev, port1,

						USB_PORT_FEAT_C_SUSPEND);

		}



		/* TRSMRCY = 10 msec */

		msleep(10);

	}



	if (udev->persist_enabled)

drivers/usb/dwc2/core.h

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ struct dwc2_hsotg_req; 
 * @debugfs: File entry for debugfs file for this endpoint.

 * @dir_in: Set to true if this endpoint is of the IN direction, which

 *          means that it is sending data to the Host.

 * @map_dir: Set to the value of dir_in when the DMA buffer is mapped.

 * @index: The index for the endpoint registers.

 * @mc: Multi Count - number of transactions per microframe

 * @interval: Interval for periodic endpoints, in frames or microframes.
@@ -162,6 +163,7 @@ struct dwc2_hsotg_ep { 
	unsigned short		fifo_index;



	unsigned char           dir_in;

	unsigned char           map_dir;

	unsigned char           index;

	unsigned char           mc;

	u16                     interval;