[coreboot-gerrit] Change in ...coreboot[master]: libpayload: keyboard: Add option to ignore failures during init

[Duncan Laurie (Code Review)]

Duncan Laurie has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31657 )

Change subject: libpayload: keyboard: Add option to ignore failures during init
......................................................................

libpayload: keyboard: Add option to ignore failures during init

If keys are pressed at boot some keyboard controllers will not
properly respond with an ACK to commands, which results in the
keyboard_init function aborting before it adds the keyboard to the
input device list.

This same keyboard controller will manage to properly return keyboard
data when keys are pressed later, so it is possible for it to be
functional in the payload even if it does not respond properly to
every command during initialization.

In order to allow payloads to use the keyboard when this happens a
new Kconfig option is added to ignore the keyboard ACK response and
always add the keyboard to the input device list.  This option is
disabled by default and must be enabled by the specific boards that
need it.

BUG=b:126633269
TEST=boot on device with this controller and press keys during boot
and see that the keyboard is still functional in the payload.

Change-Id: Icc6053f99804f1b57d785cb04235b5c4b8d5426f
Signed-off-by: Duncan Laurie 
Reviewed-on: https://review.coreboot.org/c/31657
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
Reviewed-by: Paul Menzel 
---
M payloads/libpayload/Kconfig
M payloads/libpayload/drivers/i8042/keyboard.c
2 files changed, 7 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Furquan Shaikh: Looks good to me, approved

diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig
index a79269f..fd967c1 100644
--- a/payloads/libpayload/Kconfig
+++ b/payloads/libpayload/Kconfig
@@ -344,6 +344,10 @@
    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"
+	default n
+
 config PC_KEYBOARD_LAYOUT_US
    bool "English (US) keyboard layout"
    depends on PC_KEYBOARD
diff --git a/payloads/libpayload/drivers/i8042/keyboard.c b/payloads/libpayload/drivers/i8042/keyboard.c
index 062aec2..a0d5b63 100644
--- a/payloads/libpayload/drivers/i8042/keyboard.c
+++ b/payloads/libpayload/drivers/i8042/keyboard.c
@@ -309,16 +309,16 @@

/* Set scancode set 1 */
    ret = keyboard_cmd(I8042_KBCMD_SET_SCANCODE);
-	if (!ret)
+	if (!ret && !IS_ENABLED(CONFIG_LP_PC_KEYBOARD_IGNORE_INIT_FAILURE))
    	return;

ret = keyboard_cmd(I8042_SCANCODE_SET_1);
-	if (!ret)
+	if (!ret && !IS_ENABLED(CONFIG_LP_PC_KEYBOARD_IGNORE_INIT_FAILURE))
    	return;

/* Enable scanning */
    ret = keyboard_cmd(I8042_KBCMD_EN);
-	if (!ret)
+	if (!ret && !IS_ENABLED(CONFIG_LP_PC_KEYBOARD_IGNORE_INIT_FAILURE))
    	return;

console_add_input_driver(&cons);