diff options
Diffstat (limited to 'common/keyboard_8042.c')
| -rw-r--r-- | common/keyboard_8042.c | 115 |
1 files changed, 27 insertions, 88 deletions
diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c index 6e2b14719f..e0371ddd5c 100644 --- a/common/keyboard_8042.c +++ b/common/keyboard_8042.c @@ -5,9 +5,8 @@ * 8042 keyboard protocol */ -#include "atkbd_protocol.h" -#include "builtin/assert.h" #include "button.h" +#include "builtin/assert.h" #include "chipset.h" #include "common.h" #include "console.h" @@ -15,6 +14,7 @@ #include "hooks.h" #include "host_command.h" #include "i8042_protocol.h" +#include "atkbd_protocol.h" #include "keyboard_8042_sharedlib.h" #include "keyboard_config.h" #include "keyboard_protocol.h" @@ -78,15 +78,6 @@ enum scancode_set_list { #define KB_TO_HOST_RETRIES 3 /* - * Timeout for SETLEDS command. Kernel is supposed to send the second byte - * within this period. When timeout occurs, the second byte is received as - * 'Unsupported AT keyboard command 0x00' (or 0x04). You can evaluate your - * timeout is too long or too short by calculating the duration between 'KB - * SETLEDS' and 'Unsupported AT...'. - */ -#define SETLEDS_TIMEOUT (30 * MSEC) - -/* * Mutex to control write access to the to-host buffer head. Don't need to * mutex the tail because reads are only done in one place. */ @@ -96,7 +87,6 @@ static mutex_t to_host_mutex; enum { CHAN_KBD = 0, CHAN_AUX, - CHAN_CMD, }; struct data_byte { uint8_t chan; @@ -104,7 +94,6 @@ struct data_byte { }; static struct queue const to_host = QUEUE_NULL(16, struct data_byte); -static struct queue const to_host_cmd = QUEUE_NULL(16, struct data_byte); /* Queue command/data from the host */ enum { @@ -173,7 +162,6 @@ static int typematic_inter_delay; static int typematic_len; /* length of typematic_scan_code */ static uint8_t typematic_scan_code[MAX_SCAN_CODE_LEN]; static timestamp_t typematic_deadline; -static timestamp_t setleds_deadline; #define KB_SYSJUMP_TAG 0x4b42 /* "KB" */ #define KB_HOOK_VERSION 2 @@ -194,16 +182,18 @@ struct kblog_t { /* * Type: * - * a = aux byte enqueued to send to host - * c = command byte from host - * d = data byte from host - * r = typematic * s = byte enqueued to send to host + * a = aux byte enqueued to send to host * t = to-host queue tail pointer before type='s' bytes enqueued - * u = byte enqueued to send to host with priority - * x = to_host queue was cleared - * A = byte actually sent to host via LPC as AUX + * + * d = data byte from host + * c = command byte from host + * + * k = to-host queue head pointer before byte dequeued * K = byte actually sent to host via LPC + * A = byte actually sent to host via LPC as AUX + * + * x = to_host queue was cleared * * The to-host head and tail pointers are logged pre-wrapping to the * queue size. This means that they continually increment as units @@ -275,7 +265,7 @@ static void aux_enable_irq(int enable) * host cannot read the previous byte away in time. * * @param len Number of bytes to send to the host - * @param bytes Data to send + * @param to_host Data to send * @param chan Channel to send data on */ static void i8042_send_to_host(int len, const uint8_t *bytes, uint8_t chan, @@ -291,29 +281,15 @@ static void i8042_send_to_host(int len, const uint8_t *bytes, uint8_t chan, for (i = 0; i < len; i++) kblog_put('r', bytes[i]); } else { - struct queue const *queue = &to_host; - - if (chan == CHAN_CMD) - queue = &to_host_cmd; - - for (i = 0; i < len; i++) { - char type; - - if (chan == CHAN_AUX) - type = 'a'; - else if (chan == CHAN_CMD) - type = 'u'; - else - type = 's'; - kblog_put(type, bytes[i]); - } + for (i = 0; i < len; i++) + kblog_put(chan == CHAN_AUX ? 'a' : 's', bytes[i]); - if (queue_space(queue) >= len) { - kblog_put('t', queue->state->tail); + if (queue_space(&to_host) >= len) { + kblog_put('t', to_host.state->tail); for (i = 0; i < len; i++) { data.chan = chan; data.byte = bytes[i]; - queue_add_unit(queue, &data); + queue_add_unit(&to_host, &data); } } } @@ -441,7 +417,6 @@ void keyboard_clear_buffer(void) mutex_lock(&to_host_mutex); kblog_put('x', queue_count(&to_host)); queue_init(&to_host); - queue_init(&to_host_cmd); mutex_unlock(&to_host_mutex); lpc_keyboard_clear_buffer(); } @@ -686,8 +661,6 @@ static int handle_keyboard_data(uint8_t data, uint8_t *output) /* Chrome OS doesn't have keyboard LEDs, so ignore */ output[out_len++] = ATKBD_RET_ACK; data_port_state = STATE_ATKBD_SETLEDS; - setleds_deadline.val = get_time().val + SETLEDS_TIMEOUT; - CPRINTS5("KB SETLEDS"); break; case ATKBD_CMD_EX_SETLEDS: @@ -895,23 +868,20 @@ static void i8042_handle_from_host(void) struct host_byte h; int ret_len; uint8_t output[MAX_SCAN_CODE_LEN]; - uint8_t chan; + uint8_t chan = CHAN_KBD; while (queue_remove_unit(&from_host, &h)) { if (h.type == HOST_COMMAND) { ret_len = handle_keyboard_command(h.byte, output); - chan = CHAN_KBD; } else { CPRINTS5("KB recv data: 0x%02x", h.byte); kblog_put('d', h.byte); if (IS_ENABLED(CONFIG_8042_AUX) && - handle_mouse_data(h.byte, output, &ret_len)) { + handle_mouse_data(h.byte, output, &ret_len)) chan = CHAN_AUX; - } else { + else ret_len = handle_keyboard_data(h.byte, output); - chan = CHAN_CMD; - } } i8042_send_to_host(ret_len, output, chan, 0); @@ -955,14 +925,10 @@ void keyboard_protocol_task(void *u) i8042_handle_from_host(); /* Check if we have data to send to host */ - if (queue_is_empty(&to_host) && - queue_is_empty(&to_host_cmd)) + if (queue_is_empty(&to_host)) break; - /* - * Check if the output buffer is full. We can't proceed - * until the host read the data. - */ + /* Handle data waiting for host */ if (lpc_keyboard_has_char()) { /* If interrupts disabled, nothing we can do */ if (!i8042_keyboard_irq_enabled && @@ -980,53 +946,26 @@ void keyboard_protocol_task(void *u) * data? Send it another interrupt in case it * somehow missed the first one. */ - CPRINTS("KB host not responding"); + CPRINTS("KB extra IRQ"); lpc_keyboard_resume_irq(); retries = 0; break; } - /* - * We know DBBOUT is empty but we need act quickly as - * the host might be sending a byte to DBBIN. - * - * So be cautious if you're adding any code below up to - * lpc_keyboard_put_char since that'll increase the race - * condition. For example, you don't want to add CPRINTS - * or kblog_put. - * - * We should claim OBF=1 atomically to prevent the host - * from writing to DBBIN (i.e. set-ibf-if-not-obf). It's - * not possible for NPCX because NPCX's HIKMST-IBF is - * read-only. - */ - /* Get a char from buffer. */ - if (queue_count(&to_host_cmd)) { - queue_remove_unit(&to_host_cmd, &entry); - } else if (data_port_state == STATE_ATKBD_SETLEDS) { - /* to_host_cmd is empty but in SETLEDS */ - if (!timestamp_expired(setleds_deadline, &t)) - /* Let's wait for the 2nd byte. */ - break; - /* Didn't receive 2nd byte. Go back to CMD. */ - CPRINTS("KB SETLEDS timeout"); - data_port_state = STATE_ATKBD_CMD; - } else { - /* to_host isn't empty && not in SETLEDS */ - queue_remove_unit(&to_host, &entry); - } + kblog_put('k', to_host.state->head); + queue_remove_unit(&to_host, &entry); /* Write to host. */ if (entry.chan == CHAN_AUX && IS_ENABLED(CONFIG_8042_AUX)) { + kblog_put('A', entry.byte); lpc_aux_put_char(entry.byte, i8042_aux_irq_enabled); - kblog_put('A', entry.byte); } else { + kblog_put('K', entry.byte); lpc_keyboard_put_char( entry.byte, i8042_keyboard_irq_enabled); - kblog_put('K', entry.byte); } retries = 0; } |