Commit fd7c519d authored by Jaroslav Kysela's avatar Jaroslav Kysela Committed by Greg Kroah-Hartman
Browse files

USB: hub.c: Add initial_descriptor_timeout module parameter for usbcore 



This patch adds initial_descriptor_timeout module parameter for usbcore.ko
to allow modify initial 64-byte USB_REQ_GET_DESCRIPTOR timeout for
non-standard devices.

For example, the SATA8000 device from DATAST0R Technology Corp
requires about 10 seconds to send reply (probably it waits until
inserted disk is ready for operation).

Also, this patch adds missing usbcore parameters to
Documentation/kernel-parameters.txt.

Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 49e7cc84

Documentation/kernel-parameters.txt

+19 −0
Original line number Diff line number Diff line
@@ -2253,6 +2253,25 @@ and is between 256 and 4096 characters. It is defined in the file 
			autosuspended.  Devices for which the delay is set

			to a negative value won't be autosuspended at all.



	usbcore.usbfs_snoop=

			[USB] Set to log all usbfs traffic (default 0 = off).



	usbcore.blinkenlights=

			[USB] Set to cycle leds on hubs (default 0 = off).



	usbcore.old_scheme_first=

			[USB] Start with the old device initialization

			scheme (default 0 = off).



	usbcore.use_both_schemes=

			[USB] Try the other device initialization scheme

			if the first one fails (default 1 = enabled).



	usbcore.initial_descriptor_timeout=

			[USB] Specifies timeout for the initial 64-byte

                        USB_REQ_GET_DESCRIPTOR request in milliseconds

			(default 5000 = 5.0 seconds).



	usbhid.mousepoll=

			[USBHID] The interval which mice are to be polled at.

drivers/usb/core/hub.c

+10 −1
Original line number Diff line number Diff line
@@ -100,6 +100,15 @@ static int blinkenlights = 0; 
module_param (blinkenlights, bool, S_IRUGO);

MODULE_PARM_DESC (blinkenlights, "true to cycle leds on hubs");



/*

 * Device SATA8000 FW1.0 from DATAST0R Technology Corp requires about

 * 10 seconds to send reply for the initial 64-byte descriptor request.

 */

/* define initial 64-byte descriptor request timeout in milliseconds */

static int initial_descriptor_timeout = USB_CTRL_GET_TIMEOUT;

module_param(initial_descriptor_timeout, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(initial_descriptor_timeout, "initial 64-byte descriptor request timeout in milliseconds (default 5000 - 5.0 seconds)");



/*

 * As of 2.6.10 we introduce a new USB device initialization scheme which

 * closely resembles the way Windows works.  Hopefully it will be compatible
@@ -2538,7 +2547,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, 
					USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,

					USB_DT_DEVICE << 8, 0,

					buf, GET_DESCRIPTOR_BUFSIZE,

					USB_CTRL_GET_TIMEOUT);

					initial_descriptor_timeout);

				switch (buf->bMaxPacketSize0) {

				case 8: case 16: case 32: case 64: case 255:

					if (buf->bDescriptorType ==

CRA Git | Maintained and supported by SUSTech CRA and CCSE