Commit fb6f076d authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: hub: Add Kconfig option to reduce number of port initialization retries 



Description based on one by Yasushi Asano:

According to 6.7.22 A-UUT “Device No Response” for connection timeout
of USB OTG and EH automated compliance plan v1.2, enumeration failure
has to be detected within 30 seconds.  However, the old and new
enumeration schemes each make a total of 12 attempts, and each attempt
can take 5 seconds to time out, so the PET test fails.

This patch adds a new Kconfig option (CONFIG_USB_FEW_INIT_RETRIES);
when the option is set all the initialization retry loops except the
outermost are reduced to a single iteration.  This reduces the total
number of attempts to four, allowing Linux hosts to pass the PET test.

The new option is disabled by default to preserve the existing
behavior.  The reduced number of retries may fail to initialize a few
devices that currently do work, but for the most part there should be
no change.  And in cases where the initialization does fail, it will
fail much more quickly.

Reported-and-tested-by: default avataryasushi asano <yazzep@gmail.com>
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20200928152217.GB134701@rowland.harvard.edu


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19502e69

drivers/usb/core/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -32,6 +32,20 @@ config USB_DEFAULT_PERSIST 
	  If you have any questions about this, say Y here, only say N

	  if you know exactly what you are doing.



config USB_FEW_INIT_RETRIES

	bool "Limit USB device initialization to only a few retries"

	help

	  When a new USB device is detected, the kernel tries very hard

	  to initialize and enumerate it, with lots of nested retry loops.

	  This almost always works, but when it fails it can take a long time.

	  This option tells the kernel to make only a few retry attempts,

	  so that the total time required for a failed initialization is

	  no more than 30 seconds (as required by the USB OTG spec).



	  Say N here unless you require new-device enumeration failure to

	  occur within 30 seconds (as might be needed in an embedded

	  application).



config USB_DYNAMIC_MINORS

	bool "Dynamic USB minor allocation"

	help

drivers/usb/core/hub.c

+12 −1
Original line number Diff line number Diff line
@@ -2705,10 +2705,20 @@ static unsigned hub_is_wusb(struct usb_hub *hub) 
}





#ifdef CONFIG_USB_FEW_INIT_RETRIES

#define PORT_RESET_TRIES	2

#define SET_ADDRESS_TRIES	1

#define GET_DESCRIPTOR_TRIES	1

#define GET_MAXPACKET0_TRIES	1

#define PORT_INIT_TRIES		4



#else

#define PORT_RESET_TRIES	5

#define SET_ADDRESS_TRIES	2

#define GET_DESCRIPTOR_TRIES	2

#define GET_MAXPACKET0_TRIES	3

#define PORT_INIT_TRIES		4

#endif	/* CONFIG_USB_FEW_INIT_RETRIES */



#define HUB_ROOT_RESET_TIME	60	/* times are in msec */

#define HUB_SHORT_RESET_TIME	10
@@ -4691,7 +4701,8 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, 
			 * 255 is for WUSB devices, we actually need to use

			 * 512 (WUSB1.0[4.8.1]).

			 */

			for (operations = 0; operations < 3; ++operations) {

			for (operations = 0; operations < GET_MAXPACKET0_TRIES;

					++operations) {

				buf->bMaxPacketSize0 = 0;

				r = usb_control_msg(udev, usb_rcvaddr0pipe(),

					USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,

CRA Git | Maintained and supported by SUSTech CRA and CCSE