Messages in this thread Patch in this message | | | Date | Sun, 20 Sep 2009 18:29:38 GMT | From | tip-bot for Jan Beulich <> | Subject | [tip:x86/urgent] x86: Increase timeout for EHCI debug port reset completion in early printk |
| |
Commit-ID: 414128bd33fef3242747154dfa444970bc5caf4c Gitweb: http://git.kernel.org/tip/414128bd33fef3242747154dfa444970bc5caf4c Author: Jan Beulich <JBeulich@novell.com> AuthorDate: Fri, 4 Sep 2009 09:13:49 +0100 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Sun, 20 Sep 2009 20:23:37 +0200
x86: Increase timeout for EHCI debug port reset completion in early printk
On one of my systems, several thousand iterations are needed before CMD_RESET can be observed clear after setting it. Using a much higher value here obviously cannot hurt.
Signed-off-by: Jan Beulich <jbeulich@novell.com> Cc: Yinghai Lu <yhlu.kernel@gmail.com> LKML-Reference: <4AA0E85D02000078000136F9@vpn.id2.novell.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
--- arch/x86/kernel/early_printk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c index 335f049..b11cab3 100644 --- a/arch/x86/kernel/early_printk.c +++ b/arch/x86/kernel/early_printk.c @@ -624,7 +624,7 @@ try_next_port: return -1; } - loop = 10; + loop = 100000; /* Reset the EHCI controller */ cmd = readl(&ehci_regs->command); cmd |= CMD_RESET;
| |