| From 46819680a109e01f41eaa43711e631ec237b0152 Mon Sep 17 00:00:00 2001 |
| From: Colin Ian King <colin.king@canonical.com> |
| Date: Mon, 30 Jul 2012 16:06:42 +0100 |
| Subject: [PATCH] USB: echi-dbgp: increase the controller wait time to come out |
| of halt. |
| |
| commit f96a4216e85050c0a9d41a41ecb0ae9d8e39b509 upstream. |
| |
| The default 10 microsecond delay for the controller to come out of |
| halt in dbgp_ehci_startup is too short, so increase it to 1 millisecond. |
| |
| This is based on emperical testing on various USB debug ports on |
| modern machines such as a Lenovo X220i and an Ivybridge development |
| platform that needed to wait ~450-950 microseconds. |
| |
| Signed-off-by: Colin Ian King <colin.king@canonical.com> |
| Signed-off-by: Jason Wessel <jason.wessel@windriver.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| drivers/usb/early/ehci-dbgp.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c |
| index 6e98a3697844..e4c7f53dc56b 100644 |
| --- a/drivers/usb/early/ehci-dbgp.c |
| +++ b/drivers/usb/early/ehci-dbgp.c |
| @@ -437,7 +437,7 @@ static int dbgp_ehci_startup(void) |
| writel(FLAG_CF, &ehci_regs->configured_flag); |
| |
| /* Wait until the controller is no longer halted */ |
| - loop = 10; |
| + loop = 1000; |
| do { |
| status = readl(&ehci_regs->status); |
| if (!(status & STS_HALT)) |
| -- |
| 1.8.5.2 |
| |
