[coreboot-gerrit] Change in coreboot[master]: libpayload/drivers/i8042: Add AT translated Keyboard support

[EricR Lai (Code Review)]

EricR Lai has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37594 )

Change subject: libpayload/drivers/i8042: Add AT translated Keyboard support
......................................................................

libpayload/drivers/i8042: Add AT translated Keyboard support

Wilco device use the AT translated keyboard and don't need to set
scancode set. Remove the ignore flag and put into translation mode
instead.

BUG=b:145130110
TEST=Draillion keyboard is usable on every boot.

Signed-off-by: Eric Lai 
Change-Id: Ie1053e24e44c5bad28b56cc92d091e24f3d9b6fd
---
M payloads/libpayload/Kconfig
M payloads/libpayload/drivers/i8042/i8042.h
M payloads/libpayload/drivers/i8042/keyboard.c
3 files changed, 38 insertions(+), 27 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/37594/1

diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig
index d216f61..f7501e3 100644
--- a/payloads/libpayload/Kconfig
+++ b/payloads/libpayload/Kconfig
@@ -343,8 +343,8 @@
    default y if ARCH_X86 # uses IO
    default n

-config PC_KEYBOARD_IGNORE_INIT_FAILURE
-	bool "Ignore keyboard failures during init and always add input device"
+config PC_KEYBOARD_AT_TRANSLATED
+	bool "AT Translation keyboard device"
    default n

config PC_KEYBOARD_LAYOUT_US
diff --git a/payloads/libpayload/drivers/i8042/i8042.h b/payloads/libpayload/drivers/i8042/i8042.h
index 643167e..f039569 100644
--- a/payloads/libpayload/drivers/i8042/i8042.h
+++ b/payloads/libpayload/drivers/i8042/i8042.h
@@ -33,6 +33,7 @@
 /* Port 0x64 commands */
 #define I8042_CMD_RD_CMD_BYTE		0x20
 #define I8042_CMD_WR_CMD_BYTE		0x60
+#define   I8042_CMD_BYTE_XLATE		(1 << 6)
 #define I8042_CMD_DIS_AUX		0xa7
 #define I8042_CMD_EN_AUX		0xa8
 #define I8042_CMD_AUX_TEST		0xa9
diff --git a/payloads/libpayload/drivers/i8042/keyboard.c b/payloads/libpayload/drivers/i8042/keyboard.c
index f9932ed..31ef384 100644
--- a/payloads/libpayload/drivers/i8042/keyboard.c
+++ b/payloads/libpayload/drivers/i8042/keyboard.c
@@ -328,34 +328,44 @@
    /* Enable first PS/2 port */
    i8042_cmd(I8042_CMD_EN_KB);

-	/* Set scancode set 1 */
-	ret = keyboard_cmd(I8042_KBCMD_SET_SCANCODE);
-	if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) {
-		printf("ERROR: Keyboard set scancode failed!\n");
-		return;
-	}
+	/* Enable keyboard translated */
+	if (CONFIG(LP_PC_KEYBOARD_AT_TRANSLATED)) {
+		/* Put keyboard into translated mode for the OS */
+		if (!i8042_cmd(I8042_CMD_RD_CMD_BYTE)) {
+			int cmd = i8042_read_data_ps2();
+			cmd |= I8042_CMD_BYTE_XLATE;
+			if (!i8042_cmd(I8042_CMD_WR_CMD_BYTE))
+				i8042_write_data(cmd);
+		}
+	} else { /* Set scancode set 1 */
+		ret = keyboard_cmd(I8042_KBCMD_SET_SCANCODE);
+		if (!ret) {
+			printf("ERROR: Keyboard set scancode failed!\n");
+			return;
+		}

-	ret = keyboard_cmd(I8042_SCANCODE_SET_1);
-	if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) {
-		printf("ERROR: Keyboard scancode set#1 failed!\n");
-		return;
-	}
+		ret = keyboard_cmd(I8042_SCANCODE_SET_1);
+		if (!ret) {
+			printf("ERROR: Keyboard scancode set#1 failed!\n");
+			return;
+		}

-	/*
-	 * Set default parameters.
-	 * Fix for broken QEMU ps/2 make scancodes.
-	 */
-	ret = keyboard_cmd(0xf6);
-	if (!ret) {
-		printf("ERROR: Keyboard set default params failed!\n");
-		return;
-	}
+		/*
+		 * Set default parameters.
+		 * Fix for broken QEMU ps/2 make scancodes.
+		 */
+		ret = keyboard_cmd(0xf6);
+		if (!ret) {
+			printf("ERROR: Keyboard set default params failed!\n");
+			return;
+		}

-	/* Enable scanning */
-	ret = keyboard_cmd(I8042_KBCMD_EN);
-	if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) {
-		printf("ERROR: Keyboard enable scanning failed!\n");
-		return;
+		/* Enable scanning */
+		ret = keyboard_cmd(I8042_KBCMD_EN);
+		if (!ret) {
+			printf("ERROR: Keyboard enable scanning failed!\n");
+			return;
+		}
    }

console_add_input_driver(&cons);