From d2ac5648f489e96d07e8e656c4ad7dda02ad0cd8 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sat, 11 Feb 2017 12:13:03 -0500 Subject: [PATCH] ps2port: Disable keyboard/mouse prior to resetting ps2 controller If one of the ps2 ports is enabled prior to the ps2 controller reset then it is possible a device event (eg, key press or mouse move) could be mistaken for the controller reset response code. This would result in a failure and the keyboard would be disabled during the boot. Always disabling the keyboard and mouse prior to reset ensures that the controller reset return code can be read properly. Tested-by: Paul Menzel Signed-off-by: Kevin O'Connor (cherry picked from commit dbf9dd27f3aefc171839d60c188134da8ad3089d) --- src/hw/ps2port.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/hw/ps2port.c b/src/hw/ps2port.c index d9727d2..88b1059 100644 --- a/src/hw/ps2port.c +++ b/src/hw/ps2port.c @@ -449,11 +449,22 @@ ps2_check_event(void) static void ps2_keyboard_setup(void *data) { - /* flush incoming keys */ + // flush incoming keys (also verifies port is likely present) int ret = i8042_flush(); if (ret) return; + // Disable keyboard / mouse and drain any input they may have sent + ret = i8042_command(I8042_CMD_KBD_DISABLE, NULL); + if (ret) + return; + ret = i8042_command(I8042_CMD_AUX_DISABLE, NULL); + if (ret) + return; + ret = i8042_flush(); + if (ret) + return; + // Controller self-test. u8 param[2]; ret = i8042_command(I8042_CMD_CTL_TEST, param); -- 2.39.5