diff options
| author | Eugene Surovegin <ebs@ebshome.net> | 2013-08-26 11:53:32 -0700 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-09-11 21:21:24 -0400 |
| commit | f3133d2560996fadd5bab2623e212a691ea70cc8 (patch) | |
| tree | e7e8dc812f84eb106aef5a19fdbf8b47cbf12347 | |
| parent | 2c2273e6aae724b1e78e8cd6f4275f7aac5ac8e7 (diff) | |
| download | linux-rt-f3133d2560996fadd5bab2623e212a691ea70cc8.tar.gz | |
powerpc/hvsi: Increase handshake timeout from 200ms to 400ms.
[ Upstream commit d220980b701d838560a70de691b53be007e99e78 ]
This solves a problem observed in kexec'ed kernel where 200ms timeout is
too short and bootconsole fails to initialize. Console did eventually
become workable but much later into the boot process.
Observed timeout was around 260ms, but I decided to make it a little bigger
for more reliability.
This has been tested on Power7 machine with Petitboot as a primary
bootloader and PowerNV firmware.
CC: <stable@vger.kernel.org>
Signed-off-by: Eugene Surovegin <surovegin@google.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | drivers/tty/hvc/hvsi_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c index 59c135dd5d20..2c51419bd40a 100644 --- a/drivers/tty/hvc/hvsi_lib.c +++ b/drivers/tty/hvc/hvsi_lib.c @@ -341,8 +341,8 @@ void hvsilib_establish(struct hvsi_priv *pv) pr_devel("HVSI@%x: ... waiting handshake\n", pv->termno); - /* Try for up to 200s */ - for (timeout = 0; timeout < 20; timeout++) { + /* Try for up to 400ms */ + for (timeout = 0; timeout < 40; timeout++) { if (pv->established) goto established; if (!hvsi_get_packet(pv)) |