diff options
author | Truxton Fulton <trux@truxton.com> | 2007-07-21 11:10:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 21:37:10 -0400 |
commit | 8b93789808756bcc1e5c90c99f1b1ef52f839a51 (patch) | |
tree | bca8744b64671a92c349e4c08e29eef93c5a2a14 | |
parent | bd78432c8f209a1028f4e5bada8b1da1d8e4da09 (diff) |
i386: fix machine rebooting
Commit 59f4e7d572980a521b7bdba74ab71b21f5995538 fixed machine rebooting
on Truxton's machine (when no keyboard was present). But it broke it on
Lee's machine.
The patch reinstates the old (pre-59f4e7d572980a521b7bdba74ab71b21f5995538)
code and if that doesn't work out, try the new,
post-59f4e7d572980a521b7bdba74ab71b21f5995538 code instead.
Cc: Lee Garrett <lee-in-berlin@web.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/asm-i386/mach-default/mach_reboot.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/include/asm-i386/mach-default/mach_reboot.h b/include/asm-i386/mach-default/mach_reboot.h index a955e57ad016..e23fd9fbebb3 100644 --- a/include/asm-i386/mach-default/mach_reboot.h +++ b/include/asm-i386/mach-default/mach_reboot.h | |||
@@ -19,14 +19,37 @@ static inline void kb_wait(void) | |||
19 | static inline void mach_reboot(void) | 19 | static inline void mach_reboot(void) |
20 | { | 20 | { |
21 | int i; | 21 | int i; |
22 | |||
23 | /* old method, works on most machines */ | ||
22 | for (i = 0; i < 10; i++) { | 24 | for (i = 0; i < 10; i++) { |
23 | kb_wait(); | 25 | kb_wait(); |
24 | udelay(50); | 26 | udelay(50); |
27 | outb(0xfe, 0x64); /* pulse reset low */ | ||
28 | udelay(50); | ||
29 | } | ||
30 | |||
31 | /* New method: sets the "System flag" which, when set, indicates | ||
32 | * successful completion of the keyboard controller self-test (Basic | ||
33 | * Assurance Test, BAT). This is needed for some machines with no | ||
34 | * keyboard plugged in. This read-modify-write sequence sets only the | ||
35 | * system flag | ||
36 | */ | ||
37 | for (i = 0; i < 10; i++) { | ||
38 | int cmd; | ||
39 | |||
40 | outb(0x20, 0x64); /* read Controller Command Byte */ | ||
41 | udelay(50); | ||
42 | kb_wait(); | ||
43 | udelay(50); | ||
44 | cmd = inb(0x60); | ||
45 | udelay(50); | ||
46 | kb_wait(); | ||
47 | udelay(50); | ||
25 | outb(0x60, 0x64); /* write Controller Command Byte */ | 48 | outb(0x60, 0x64); /* write Controller Command Byte */ |
26 | udelay(50); | 49 | udelay(50); |
27 | kb_wait(); | 50 | kb_wait(); |
28 | udelay(50); | 51 | udelay(50); |
29 | outb(0x14, 0x60); /* set "System flag" */ | 52 | outb(cmd | 0x04, 0x60); /* set "System flag" */ |
30 | udelay(50); | 53 | udelay(50); |
31 | kb_wait(); | 54 | kb_wait(); |
32 | udelay(50); | 55 | udelay(50); |