[coreboot-gerrit] Change in ...coreboot[master]: libpayload/i8042/keyboard: Fix return value check for keyboard_cmd

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33185 )

Change subject: libpayload/i8042/keyboard: Fix return value check for keyboard_cmd
......................................................................

libpayload/i8042/keyboard: Fix return value check for keyboard_cmd

CB:32951 ("libpayload: Reset PS/2 keyboard") added a call to reset
keyboard and check the return value of keyboard_cmd() to compare
against I8042_KBCMD_ACK. However, keyboard_cmd() already checks for
ACK and returns 1 or 0 based on whether ACK is received.

This change fixes the check introduced by CB:32951 to compare against
0 just like the other checks for keyboard_cmd(). Additionally, it adds
error messages for all failed commands in keyboard_init() to make the
prints consistent in case of failure.

BUG=b:134366527
TEST=Verified that logs do not contain "ERROR: Keyboard reset failed"
anymore.

Change-Id: Idcadaae12e0a44e404a1d98c6deb633d97058203
Signed-off-by: Furquan Shaikh 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33185
Tested-by: build bot (Jenkins) 
Reviewed-by: Frank Wu 
Reviewed-by: Paul Menzel 
---
M payloads/libpayload/drivers/i8042/keyboard.c
1 file changed, 15 insertions(+), 7 deletions(-)

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

diff --git a/payloads/libpayload/drivers/i8042/keyboard.c b/payloads/libpayload/drivers/i8042/keyboard.c
index 12255fb..240385c 100644
--- a/payloads/libpayload/drivers/i8042/keyboard.c
+++ b/payloads/libpayload/drivers/i8042/keyboard.c
@@ -172,7 +172,7 @@
 {
    i8042_write_data(cmd);

-	return i8042_wait_read_ps2() == 0xfa;
+	return i8042_wait_read_ps2() == I8042_KBCMD_ACK;
 }

int keyboard_havechar(void)
@@ -319,32 +319,40 @@

/* Reset keyboard and self test (keyboard side) */
    ret = keyboard_cmd(I8042_KBCMD_RESET);
-	if (ret != I8042_KBCMD_ACK) {
-		printf("ERROR: Keyboard reset failed ACK: 0x%x\n", ret);
+	if (!ret) {
+		printf("ERROR: Keyboard reset failed!\n");
    	return;
    }

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

ret = keyboard_cmd(I8042_SCANCODE_SET_1);
-	if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE))
+	if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) {
+		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)
+	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))
+	if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) {
+		printf("ERROR: Keyboard enable scanning failed!\n");
    	return;
+	}

console_add_input_driver(&cons);
 }