serial: stm32: fix software flow control
Subsystems (2)
cover serial: stm32: fix software flow control
This serie fix issues on STM32 USART driver when using software flow control.
Valentin Caron (2):
serial: stm32: prevent TDR register overwrite when sending x_char
serial: stm32: fix software flow control transfer
drivers/tty/serial/stm32-usart.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
Signature · 1 line
2.17.1
PATCH 1/2 serial: stm32: prevent TDR register overwrite when sending x_char
When sending x_char in stm32_usart_transmit_chars(), driver can overwrite the value of TDR register by the value of x_char. If this happens, the previous value that was present in TDR register will not be sent through uart.
This code checks if the previous value in TDR register is sent before writing the x_char value into register.
--- drivers/tty/serial/stm32-usart.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/tty/serial/stm32-usart.c +12 -0
@@ -550,11 +550,23 @@ static void stm32_usart_transmit_chars(struct uart_port *port)struct stm32_port *stm32_port =to_stm32_port (port);const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;struct circ_buf *xmit = &port->state->xmit; +u32 isr; +int ret;if (port->x_char) {if (stm32_usart_tx_dma_started (stm32_port) &&stm32_usart_tx_dma_enabled (stm32_port))stm32_usart_clr_bits (port, ofs->cr3,USART_CR3_DMAT ); + +/* Check that TDR is empty before filling FIFO */ + ret = +readl_relaxed_poll_timeout_atomic (port->membase + ofs->isr, + isr, + (isr &USART_SR_TXE ), +10 ,1000 ); +if (ret) +dev_warn (port->dev,"1 character may be erased\n" ); +writel_relaxed (port->x_char, port->membase + ofs->tdr); port->x_char =0 ; port->icount.tx++;
Signature · 1 line
2.17.1
PATCH 2/2 serial: stm32: fix software flow control transfer
In reply to Valentin Caronx_char is ignored by stm32_usart_start_tx() when xmit buffer is empty.
Fix start_tx condition to allow x_char to be sent.
--- drivers/tty/serial/stm32-usart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/stm32-usart.c +1 -1
@@ -742,7 +742,7 @@ static void stm32_usart_start_tx(struct uart_port *port)struct serial_rs485 *rs485conf = &port->rs485;struct circ_buf *xmit = &port->state->xmit; -if (uart_circ_empty (xmit)) +if (uart_circ_empty (xmit) && !port->x_char)return ;if (rs485conf->flags &SER_RS485_ENABLED ) {
Signature · 1 line
2.17.1