This patch avoids a timeout during PS/2 keyboard

initialization. It can reduce KBC init time by up to 400 ms on
real hardware, and by a minute or so on AMD simnow.

Signed-off-by: Scott Duplichan <scott@notabs.org>
Acked-by: Marc Jones <marcj303@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5798 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/pc80/keyboard.c b/src/pc80/keyboard.c
index 9dadf0e39afb045bed2c49c8839e24734f5cd8b1..8552860b6fdf218a82072bc4afa03a0a02ef1d18 100644 (file)
--- a/src/pc80/keyboard.c
+++ b/src/pc80/keyboard.c
@@ -244,7 +244,7 @@ void pc_keyboard_init(struct pc_keyboard *keyboard)
        outb(0x60, KBD_COMMAND);
        if (!kbc_input_buffer_empty()) return;
        outb(0x61, KBD_DATA);   /* send cmd: enable keyboard and IRQ 1 */
-       if (kbc_output_buffer_full()) {
+       if (!kbc_input_buffer_empty()) {
                printk(BIOS_ERR, "Timeout during final keyboard enable\n");
                return;
        }