[tip:x86/urgent] x86: Increase timeout for EHCI debug port reset completion in early printk

From: tip-bot for Jan Beulich
Date: Sun Sep 20 2009 - 14:30:14 EST


Commit-ID: 414128bd33fef3242747154dfa444970bc5caf4c
Gitweb: http://git.kernel.org/tip/414128bd33fef3242747154dfa444970bc5caf4c
Author: Jan Beulich <JBeulich@xxxxxxxxxx>
AuthorDate: Fri, 4 Sep 2009 09:13:49 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
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@xxxxxxxxxx>
Cc: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
LKML-Reference: <4AA0E85D02000078000136F9@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/