Skip to content

Commit

Permalink
[PATCH] x86_64: Reduce number of retries for reset through keyboard c…
Browse files Browse the repository at this point in the history
…ontroller

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: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Nov 15, 2005
1 parent 2b09187 commit a6f5deb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/x86_64/kernel/reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ void machine_emergency_restart(void)
/* Could also try the reset bit in the Hammer NB */
switch (reboot_type) {
case BOOT_KBD:
for (i=0; i<100; i++) {
for (i=0; i<10; i++) {
kb_wait();
udelay(50);
outb(0xfe,0x64); /* pulse reset low */
Expand Down
2 changes: 1 addition & 1 deletion include/asm-i386/mach-default/mach_reboot.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ static inline void kb_wait(void)
static inline void mach_reboot(void)
{
int i;
for (i = 0; i < 100; i++) {
for (i = 0; i < 10; i++) {
kb_wait();
udelay(50);
outb(0x60, 0x64); /* write Controller Command Byte */
Expand Down

0 comments on commit a6f5deb

Please sign in to comment.