Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47591 )
Change subject: libpayload/keyboard: Add debug output to all state transitions ......................................................................
libpayload/keyboard: Add debug output to all state transitions
Change-Id: I643a821d4c41fc068f2bab0bd571b0a4a359f59a Signed-off-by: Nico Huber nico.h@gmx.de --- M payloads/libpayload/drivers/i8042/keyboard.c 1 file changed, 26 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/47591/1
diff --git a/payloads/libpayload/drivers/i8042/keyboard.c b/payloads/libpayload/drivers/i8042/keyboard.c index ab516b4..dad8a44 100644 --- a/payloads/libpayload/drivers/i8042/keyboard.c +++ b/payloads/libpayload/drivers/i8042/keyboard.c @@ -250,9 +250,28 @@ STATE_ENABLE_TRANSLATION, STATE_ENABLE_SCAN, STATE_RUNNING, - STATE_IGNORE, + STATE_IGNORE } keyboard_state;
+#define STATE_NAMES_ENTRY(name) [STATE_##name] = #name +static const char *const state_names[] = { + STATE_NAMES_ENTRY(INIT), + STATE_NAMES_ENTRY(SIMPLIFIED_INIT), + STATE_NAMES_ENTRY(DISABLE_SCAN), + STATE_NAMES_ENTRY(DRAIN_INPUT), + STATE_NAMES_ENTRY(DISABLE_TRANSLATION), + STATE_NAMES_ENTRY(START_SELF_TEST), + STATE_NAMES_ENTRY(SELF_TEST), + STATE_NAMES_ENTRY(CONFIGURE), + STATE_NAMES_ENTRY(CONFIGURE_SET1), + STATE_NAMES_ENTRY(ENABLE_TRANSLATION), + STATE_NAMES_ENTRY(ENABLE_SCAN), + STATE_NAMES_ENTRY(RUNNING), + STATE_NAMES_ENTRY(IGNORE) +}; +_Static_assert(ARRAY_SIZE(state_names) == STATE_IGNORE + 1, + "`state_names` need to be kept in sync."); + static uint64_t keyboard_time; static uint64_t state_time;
@@ -305,20 +324,23 @@
case STATE_SELF_TEST: if (!i8042_data_ready_ps2()) { - if (timer_us(state_time) > 5*1000*1000) + if (timer_us(state_time) > 5*1000*1000) { + debug("WARNING: Keyboard self-test timed out.\n"); next_state = STATE_DISABLE_SCAN; + } break; }
const uint8_t self_test_result = i8042_read_data_ps2(); switch (self_test_result) { case 0xaa: - /* Success! */ + debug("INFO: Keyboard self-test succeeded.\n"); next_state = STATE_CONFIGURE; break; case 0xfc: case 0xfd: /* Failure. Try again. */ + debug("WARNING: Keyboard self-test failed.\n"); next_state = STATE_START_SELF_TEST; break; default: @@ -387,6 +409,7 @@ }
if (keyboard_state != next_state) { + debug("INFO: Keyboard advancing state to '%s'.\n", state_names[next_state]); keyboard_state = next_state; state_time = timer_us(0); }