libpayload: Remove unnecessary keyboard mode setting code
keyboard_init attempts to read the existing mode register, set the
'XLATE' bit, and write it back. The implementation is buggy because the
keyboard may be active at the time we read the mode, and we can
misinterpret scancode data as the reply to our command. It leads to
problems where the KB gets disabled in firmware.
In fact, setting the 'XLATE' bit is completely unnecessary, even if we
desire QEMU keyboard support. We already set this bit when we initialize
the keyboard in pc_keyboard_init. Basically, this code does nothing
(or worse), so just remove it.
BUG=chrome-os-partner:22134
TEST=Manual on Peppy. Spam keyboard going into recovery mode, verify the
keyboard still remains functional. Verify keyboard functions in dev
mode, recovery mode, and verified boot.
BRANCH=FalcoPeppy
Change-Id: Ia3f953d66eaa0c120d2371955a3ad73a2326cc88
Original-Change-Id: Iab23f03fa8bced74842c33a7d263de5f449bb983
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/168515
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c
index 558429b..8525a3e 100644
--- a/payloads/libpayload/drivers/keyboard.c
+++ b/payloads/libpayload/drivers/keyboard.c
@@ -31,12 +31,8 @@
#include <libpayload-config.h>
#include <libpayload.h>
-#define I8042_CMD_READ_MODE 0x20
-#define I8042_CMD_WRITE_MODE 0x60
#define I8042_CMD_DIS_KB 0xad
-#define I8042_MODE_XLATE 0x40
-
struct layout_maps {
const char *country;
const unsigned short map[4][0x57];
@@ -262,16 +258,6 @@
return ret;
}
-static int keyboard_wait_read(void)
-{
- int retries = 10000;
-
- while(retries-- && !(inb(0x64) & 0x01))
- udelay(50);
-
- return (retries <= 0) ? -1 : 0;
-}
-
static int keyboard_wait_write(void)
{
int retries = 10000;
@@ -282,20 +268,6 @@
return (retries <= 0) ? -1 : 0;
}
-static unsigned char keyboard_get_mode(void)
-{
- outb(I8042_CMD_READ_MODE, 0x64);
- keyboard_wait_read();
- return inb(0x60);
-}
-
-static void keyboard_set_mode(unsigned char mode)
-{
- outb(I8042_CMD_WRITE_MODE, 0x64);
- keyboard_wait_write();
- outb(mode, 0x60);
-}
-
/**
* Set keyboard layout
* @param country string describing the keyboard layout language.
@@ -327,29 +299,16 @@
void keyboard_init(void)
{
- u8 mode;
map = &keyboard_layouts[0];
/* If 0x64 returns 0xff, then we have no keyboard
* controller */
-
if (inb(0x64) == 0xFF)
return;
/* Empty keyboard buffer */
while (keyboard_havechar()) keyboard_getchar();
- /* Read the current mode */
- mode = keyboard_get_mode();
-
- /* Turn on scancode translate mode so that we can
- use the scancode set 1 tables */
-
- mode |= I8042_MODE_XLATE;
-
- /* Write the new mode */
- keyboard_set_mode(mode);
-
console_add_input_driver(&cons);
}
