3 files changed, 55 insertions, 22 deletions

diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig
index d216f61dc8..347ccac6b0 100644
--- a/payloads/libpayload/Kconfig
+++ b/payloads/libpayload/Kconfig
@@ -347,6 +347,10 @@ config PC_KEYBOARD_IGNORE_INIT_FAILURE
 	bool "Ignore keyboard failures during init and always add input device"
 	default n
 
+config PC_KEYBOARD_AT_TRANSLATED
+	bool "AT Translation keyboard device"
+	default n
+
 config PC_KEYBOARD_LAYOUT_US
 	bool "English (US) keyboard layout"
 	depends on PC_KEYBOARD
diff --git a/payloads/libpayload/drivers/i8042/i8042.h b/payloads/libpayload/drivers/i8042/i8042.h
index 643167ef40..f03956928f 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 f9932ed4ed..4b4a56987a 100644
--- a/payloads/libpayload/drivers/i8042/keyboard.c
+++ b/payloads/libpayload/drivers/i8042/keyboard.c
@@ -312,50 +312,78 @@ static struct console_input_driver cons = {
 	.input_type = CONSOLE_INPUT_TYPE_EC,
 };
 
-void keyboard_init(void)
+/* Enable keyboard translated */
+static int enable_translated(void)
 {
-	unsigned int ret;
-	map = &keyboard_layouts[0];
-
-	/* Initialized keyboard controller. */
-	if (!i8042_probe() || !i8042_has_ps2())
-		return;
-
-	/* Empty keyboard buffer */
-	while (keyboard_havechar())
-		keyboard_getchar();
-
-	/* Enable first PS/2 port */
-	i8042_cmd(I8042_CMD_EN_KB);
+	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 {
+		printf("ERROR: Keyboard i8042_cmd failed!\n");
+		return 0;
+	}
+	return 1;
+}
 
-	/* Set scancode set 1 */
+/* Set scancode set 1 */
+static int set_scancode_set(void)
+{
+	unsigned int ret;
 	ret = keyboard_cmd(I8042_KBCMD_SET_SCANCODE);
-	if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) {
+	if (!ret) {
 		printf("ERROR: Keyboard set scancode failed!\n");
-		return;
+		return ret;
 	}
 
 	ret = keyboard_cmd(I8042_SCANCODE_SET_1);
-	if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) {
+	if (!ret) {
 		printf("ERROR: Keyboard scancode set#1 failed!\n");
-		return;
+		return ret;
 	}
 
 	/*
 	 * Set default parameters.
 	 * Fix for broken QEMU ps/2 make scancodes.
 	 */
-	ret = keyboard_cmd(0xf6);
+	ret = keyboard_cmd(I8042_KBCMD_SET_DEFAULT);
 	if (!ret) {
 		printf("ERROR: Keyboard set default params failed!\n");
-		return;
+		return ret;
 	}
 
 	/* Enable scanning */
 	ret = keyboard_cmd(I8042_KBCMD_EN);
-	if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) {
+	if (!ret) {
 		printf("ERROR: Keyboard enable scanning failed!\n");
+		return ret;
+	}
+
+	return ret;
+}
+
+void keyboard_init(void)
+{
+	map = &keyboard_layouts[0];
+
+	/* Initialized keyboard controller. */
+	if (!i8042_probe() || !i8042_has_ps2())
 		return;
+
+	/* Empty keyboard buffer */
+	while (keyboard_havechar())
+		keyboard_getchar();
+
+	/* Enable first PS/2 port */
+	i8042_cmd(I8042_CMD_EN_KB);
+
+	if (CONFIG(LP_PC_KEYBOARD_AT_TRANSLATED)) {
+		if (!enable_translated())
+			return;
+	} else {
+		if (!set_scancode_set())
+			return;
 	}
 
 	console_add_input_driver(&cons);