vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

at_keyboard: Fix falco chromebook case.

Browse source 
EC is slow, so we need few delays for it to toggle the bits correctly.

Command to enable clock and keyboard were not sent.
This commit is contained in:
Vladimir Serbinenko 2017-05-09 14:27:52 +02:00
parent 70b555a52a
commit c4b8bec5fe
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
grub-core/term/at_keyboard.c
View file

@ -40,6 +40,8 @@ grub_keyboard_controller_init (void);
static void static void
keyboard_controller_wait_until_ready (void) keyboard_controller_wait_until_ready (void)
{ {
/* 50 us would be enough but our current time resolution is 1ms. */
grub_millisleep (1);
while (! KEYBOARD_COMMAND_ISREADY (grub_inb (KEYBOARD_REG_STATUS))); while (! KEYBOARD_COMMAND_ISREADY (grub_inb (KEYBOARD_REG_STATUS)));
} }
@ -50,10 +52,11 @@ wait_ack (void)
grub_uint8_t ack; grub_uint8_t ack;
endtime = grub_get_time_ms () + 20; endtime = grub_get_time_ms () + 20;
do do {
keyboard_controller_wait_until_ready ();
ack = grub_inb (KEYBOARD_REG_DATA); ack = grub_inb (KEYBOARD_REG_DATA);
while (ack != GRUB_AT_ACK && ack != GRUB_AT_NACK } while (ack != GRUB_AT_ACK && ack != GRUB_AT_NACK
&& grub_get_time_ms () < endtime); && grub_get_time_ms () < endtime);
return ack; return ack;
} }
@ -135,12 +138,10 @@ query_mode (void)
if (!e) if (!e)
return 0; return 0;
keyboard_controller_wait_until_ready (); do {
keyboard_controller_wait_until_ready ();
do
ret = grub_inb (KEYBOARD_REG_DATA); ret = grub_inb (KEYBOARD_REG_DATA);
while (ret == GRUB_AT_ACK); } while (ret == GRUB_AT_ACK);
/* QEMU translates the set even in no-translate mode. */ /* QEMU translates the set even in no-translate mode. */
if (ret == 0x43 || ret == 1) if (ret == 0x43 || ret == 1)
return 1; return 1;
@ -169,7 +170,11 @@ set_scancodes (void)
#else #else
grub_keyboard_controller_write (grub_keyboard_controller_orig grub_keyboard_controller_write (grub_keyboard_controller_orig
& ~KEYBOARD_AT_TRANSLATE); & ~KEYBOARD_AT_TRANSLATE
& ~KEYBOARD_AT_DISABLE);
keyboard_controller_wait_until_ready ();
grub_outb (KEYBOARD_COMMAND_ENABLE, KEYBOARD_REG_DATA);
write_mode (2); write_mode (2);
ps2_state.current_set = query_mode (); ps2_state.current_set = query_mode ();

2
include/grub/at_keyboard.h
View file

@ -23,9 +23,11 @@
#define KEYBOARD_COMMAND_ISREADY(x) !((x) & 0x02) #define KEYBOARD_COMMAND_ISREADY(x) !((x) & 0x02)
#define KEYBOARD_COMMAND_READ 0x20 #define KEYBOARD_COMMAND_READ 0x20
#define KEYBOARD_COMMAND_WRITE 0x60 #define KEYBOARD_COMMAND_WRITE 0x60
#define KEYBOARD_COMMAND_ENABLE 0xf4
#define KEYBOARD_COMMAND_REBOOT 0xfe #define KEYBOARD_COMMAND_REBOOT 0xfe
#define KEYBOARD_AT_TRANSLATE 0x40 #define KEYBOARD_AT_TRANSLATE 0x40
#define KEYBOARD_AT_DISABLE 0x10
#define KEYBOARD_ISMAKE(x) !((x) & 0x80) #define KEYBOARD_ISMAKE(x) !((x) & 0x80)
#define KEYBOARD_ISREADY(x) ((x) & 0x01) #define KEYBOARD_ISREADY(x) ((x) & 0x01)