summaryrefslogtreecommitdiffstats
path: root/include/usb
diff options
context:
space:
mode:
authorSteffen Trumtrar <s.trumtrar@pengutronix.de>2015-04-28 12:51:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-05-04 09:23:08 +0200
commit10bb13e7fdf4d1417a5f537b8ef00ded9502c0b9 (patch)
tree2e52ff926fa487c2d509a9acadafbfbc6bcec3c0 /include/usb
parent6da925f87c66cd9132018b4b08a84fa98c382aa7 (diff)
downloadbarebox-10bb13e7fdf4d1417a5f537b8ef00ded9502c0b9.tar.gz
barebox-10bb13e7fdf4d1417a5f537b8ef00ded9502c0b9.tar.xz
usb: increase USB_CNTL_TIMEOUT to match linux
USB requests should be processed within a timeframe of 5s. The linux kernel also uses this timeout value for the control packets. For the musb the increase in timeout helps successfully probing USB devices (at least on one test hardware), but on the other hand doesn't slow down the system, if there are no devices, i.e. the timeout never hits. That means, that the USB core correctly aborts instead of timing out. Why and how the 100ms was chosen in the first place, can not be deduced from the git history, just that it seems to work fine for most boards. Change USB_CNTL_TIMEOUT to 5000ms and replace all occurences of `USB_CNTL_TIMEOUT * x` with just `USB_CNTL_TIMEOUT`, as the timeout is now large enough without it. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include/usb')
-rw-r--r--include/usb/usb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/usb/usb.h b/include/usb/usb.h
index 991f3d7dd1..8f3ce2aeff 100644
--- a/include/usb/usb.h
+++ b/include/usb/usb.h
@@ -39,7 +39,7 @@
#define USB_MAXCHILDREN 8 /* This is arbitrary */
#define USB_MAX_HUB 16
-#define USB_CNTL_TIMEOUT 100 /* 100ms timeout */
+#define USB_CNTL_TIMEOUT 5000 /* 5000ms timeout */
/* device request (setup) */
struct devrequest {