Commit a6f5deb2 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: Reduce number of retries for reset through keyboard controller

Old code could retry for 10 seconds worst time. Only try it
for one second now.

Suggested by Yinghai Lu

Cc: Yinghai.Lu@amd.com
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2b091875
...@@ -121,7 +121,7 @@ void machine_emergency_restart(void) ...@@ -121,7 +121,7 @@ void machine_emergency_restart(void)
/* Could also try the reset bit in the Hammer NB */ /* Could also try the reset bit in the Hammer NB */
switch (reboot_type) { switch (reboot_type) {
case BOOT_KBD: case BOOT_KBD:
for (i=0; i<100; i++) { for (i=0; i<10; i++) {
kb_wait(); kb_wait();
udelay(50); udelay(50);
outb(0xfe,0x64); /* pulse reset low */ outb(0xfe,0x64); /* pulse reset low */
......
...@@ -19,7 +19,7 @@ static inline void kb_wait(void) ...@@ -19,7 +19,7 @@ static inline void kb_wait(void)
static inline void mach_reboot(void) static inline void mach_reboot(void)
{ {
int i; int i;
for (i = 0; i < 100; i++) { for (i = 0; i < 10; i++) {
kb_wait(); kb_wait();
udelay(50); udelay(50);
outb(0x60, 0x64); /* write Controller Command Byte */ outb(0x60, 0x64); /* write Controller Command Byte */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment