diff options
Diffstat (limited to 'src/ec/system76')
| -rw-r--r-- | src/ec/system76/ec/system76_ec.c | 51 | ||||
| -rw-r--r-- | src/ec/system76/ec/system76_ec.h | 17 |
2 files changed, 68 insertions, 0 deletions
diff --git a/src/ec/system76/ec/system76_ec.c b/src/ec/system76/ec/system76_ec.c index ddcb602d4c..828376d0e5 100644 --- a/src/ec/system76/ec/system76_ec.c +++ b/src/ec/system76/ec/system76_ec.c @@ -1,7 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include "system76_ec.h" #include <arch/io.h> #include <console/system76_ec.h> +#include <console/console.h> #include <timer.h> // This is the command region for System76 EC firmware. It must be @@ -11,10 +13,13 @@ #define REG_CMD 0 #define REG_RESULT 1 +#define REG_DATA 2 // Start of command data // When command register is 0, command is complete #define CMD_FINISHED 0 +#define RESULT_OK 0 + // Print command. Registers are unique for each command #define CMD_PRINT 4 #define CMD_PRINT_REG_FLAGS 2 @@ -59,3 +64,49 @@ void system76_ec_print(uint8_t byte) if (byte == '\n' || len >= (SYSTEM76_EC_SIZE - CMD_PRINT_REG_DATA)) system76_ec_flush(); } + +bool system76_ec_cmd(uint8_t cmd, const uint8_t *request_data, + uint8_t request_size, uint8_t *reply_data, uint8_t reply_size) +{ + if (request_size > SYSTEM76_EC_SIZE - REG_DATA || + reply_size > SYSTEM76_EC_SIZE - REG_DATA) { + printk(BIOS_ERR, "EC command %d too long - request size %u, reply size %u\n", + cmd, request_size, reply_size); + return false; + } + + /* If any data were buffered by system76_ec_print(), flush it first */ + uint8_t buffered_len = system76_ec_read(CMD_PRINT_REG_LEN); + if (buffered_len > 0) + system76_ec_flush(); + + /* Write the data */ + uint8_t i; + for (i = 0; i < request_size; ++i) + system76_ec_write(REG_DATA + i, request_data[i]); + + /* Write the command */ + system76_ec_write(REG_CMD, cmd); + + /* Wait for the command to complete */ + bool ret = true; + int elapsed = wait_ms(1000, system76_ec_read(REG_CMD) == CMD_FINISHED); + if (elapsed == 0) { + /* Timed out: fail the command, don't attempt to read a reply. */ + printk(BIOS_WARNING, "EC command %d timed out - request size %d, reply size %d\n", + cmd, request_size, reply_size); + ret = false; + } else { + /* Read the reply */ + for (i = 0; i < reply_size; ++i) + reply_data[i] = system76_ec_read(REG_DATA+i); + /* Check the reply status */ + ret = (system76_ec_read(REG_RESULT) == RESULT_OK); + } + + /* Reset the flags and length so we can buffer console prints again */ + system76_ec_write(CMD_PRINT_REG_FLAGS, 0); + system76_ec_write(CMD_PRINT_REG_LEN, 0); + + return ret; +} diff --git a/src/ec/system76/ec/system76_ec.h b/src/ec/system76/ec/system76_ec.h new file mode 100644 index 0000000000..9675bd0caf --- /dev/null +++ b/src/ec/system76/ec/system76_ec.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef SYSTEM76_EC_H +#define SYSTEM76_EC_H + +#include <stdbool.h> +#include <stdint.h> + +/* + * Send a command to the EC. request_data/request_size are the request payload, + * request_data can be NULL if request_size is 0. reply_data/reply_size are + * the reply payload, reply_data can be NULL if reply_size is 0. + */ +bool system76_ec_cmd(uint8_t cmd, const uint8_t *request_data, + uint8_t request_size, uint8_t *reply_data, uint8_t reply_size); + +#endif |