diff options
author | Nicolas Boichat <drinkcat@chromium.org> | 2017-09-05 10:10:29 +0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-10-25 03:58:50 -0700 |
commit | ab9084fd2a70a505e0e43b39e0ad40876e4853fc (patch) | |
tree | bf29e85cfbb3203dbf148dc2aecb82d7e0f793c6 /include/uart.h | |
parent | 28a5ad1646b2994853e310354b604547950a55c0 (diff) | |
download | chrome-ec-ab9084fd2a70a505e0e43b39e0ad40876e4853fc.tar.gz |
chip/npcx: Add support for pad-switching UART
NPCX5* only has one UART controller, which can be switched
between 2 pads. We keep the default pad for EC console,
however, we allow switching to the alternate pad for short,
infrequent, transactions. Both pads are assumed to use the
same baudrate and other line settings.
When switching pad, we first configure the new pad, then switch
off the old one, to avoid having no pad selected at a given time,
see b/65526215#c26.
Because of the added complexity of npcx_gpio2uart (and the fact
that it uses the global variable "pad" define in uart.c), we
move the implementation to uart.c (npcx_uart2gpio is also moved
for consistency).
When the pad is switched to alternate pad, characters input
and output on the EC console (default pad) would be lost. To
compensate for this, we:
- Switch back to main pad in case of EC panic, so that output
is shown on EC console.
- Immediately abort current alternate pad transaction if a
character is received on the default pad. Note, however,
that the first character will be lost (this can be worked
around by telling user to press enter, and have servod/FAFT
always send 2 blank lines (instead of just one) before
sending a command).
- Inhibit pad switching for 500ms after receiving a character
on default pad. Assuming a reasonable typing speed, this
should allow developers to type console commands relatively
comfortably, while not starving the alternate pad communication
for too long.
The logic above could be simplified significantly by implementing
software flow control (XON/XOFF, see b/67026316).
BRANCH=none
BUG=b:65526215
TEST=While follow-up CL that writes long 1k buffers, the following
works fine:
- type 'uart' in EC console
- Read battery power consumption from servod, which "types" in
the EC console:
while true; do dut-control ppvar_vbat_mw; sleep 1; done
no failure is seen.
TEST=Add this test code in uart_alt_pad_read_write, after the pad
has been switched, and check that panic information is
consistently printed correctly:
{
static int t;
if (t++ > 20)
t = t / ret;
}
Change-Id: I18feed2f8ca4eb85f40389f77dac3a46315310e7
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/659458
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'include/uart.h')
-rw-r--r-- | include/uart.h | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/include/uart.h b/include/uart.h index c372e3c390..5de1af92d6 100644 --- a/include/uart.h +++ b/include/uart.h @@ -246,4 +246,47 @@ int uart_comx_putc_ok(void); */ void uart_comx_putc(int c); +/* + * Functions for pad switching UART, only defined on some chips (npcx), and + * if CONFIG_UART_PAD_SWITCH is enabled. + */ +enum uart_pad { + UART_DEFAULT_PAD = 0, + UART_ALTERNATE_PAD = 1, +}; + +/** + * Reset UART pad to default pad, so that a panic information can be printed + * on the EC console. + */ +void uart_reset_default_pad_panic(void); + +/** + * Specialized function to write then read data on UART alternate pad. + * The transfer may be interrupted at any time if data is received on the main + * pad. + * + * @param tx Data to be sent + * @param tx_len Length of data to be sent + * @param rx Buffer to receive data + * @param rx_len Receive buffer length + * @param timeout_us Timeout in microseconds for the transaction to complete. + * + * @return The number of bytes read back (indicates a timeout if != rx_len). + * - -EC_ERROR_BUSY if the alternate pad cannot be used (e.g. default + * pad is currently being used), or if the transfer was interrupted. + * - -EC_ERROR_TIMEOUT in case tx_len bytes cannot be written in the + * time specified in timeout_us. + */ +int uart_alt_pad_write_read(uint8_t *tx, int tx_len, uint8_t *rx, int rx_len, + int timeout_us); + +/** + * Interrupt handler for default UART RX pin transition when UART is switched + * to alternate pad. + * + * @param signal Signal which triggered the interrupt. + */ +void uart_default_pad_rx_interrupt(enum gpio_signal signal); + #endif /* __CROS_EC_UART_H */ |