Commit d3d079bd authored by Valentin Caron's avatar Valentin Caron Committed by Greg Kroah-Hartman
Browse files

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.

Fixes: 48a6092f ("serial: stm32-usart: Add STM32 USART Driver")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarValentin Caron <valentin.caron@foss.st.com>
Link: https://lore.kernel.org/r/20220111164441.6178-2-valentin.caron@foss.st.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8838b2af

drivers/tty/serial/stm32-usart.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -550,11 +550,23 @@ static void stm32_usart_transmit_chars(struct uart_port *port) 
	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_port *stm32_port = to_stm32_port(port);

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	struct circ_buf *xmit = &port->state->xmit;

	struct circ_buf *xmit = &port->state->xmit;

	u32 isr;

	int ret;





	if (port->x_char) {

	if (port->x_char) {

		if (stm32_usart_tx_dma_started(stm32_port) &&

		if (stm32_usart_tx_dma_started(stm32_port) &&

		    stm32_usart_tx_dma_enabled(stm32_port))

		    stm32_usart_tx_dma_enabled(stm32_port))

			stm32_usart_clr_bits(port, ofs->cr3, USART_CR3_DMAT);

			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);

		writel_relaxed(port->x_char, port->membase + ofs->tdr);

		port->x_char = 0;

		port->x_char = 0;

		port->icount.tx++;

		port->icount.tx++;