From patchwork Wed Sep  8 19:11:51 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: timeout during PS/2 keyboard init
Date: Wed, 08 Sep 2010 19:11:51 -0000
From: Scott <scott@notabs.org>
X-Patchwork-Id: 1891
Message-Id: <5AF9C3BD93314353AD324B9F879933C3@m3a78>
To: <coreboot@coreboot.org>

Thanks Marc. 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>


Index: src/pc80/keyboard.c
===================================================================
--- src/pc80/keyboard.c	(revision 5788)
+++ src/pc80/keyboard.c	(working copy)
@@ -242,7 +242,7 @@
 	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;
 	}