Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85a64208 authored by Codrin.Ciubotariu@microchip.com's avatar Codrin.Ciubotariu@microchip.com Committed by Greg Kroah-Hartman
Browse files

tty/serial: atmel: RS485 & ISO7816: wait for TXRDY before sending data 



[ Upstream commit 477b8383100023ea0769979cff67e9be3a720397 ]

At this moment, TXEMPTY is checked before sending data on RS485 and ISO7816
modes. However, TXEMPTY is risen when FIFO (if used) or the Transmit Shift
Register are empty, even though TXRDY might be up and controller is able to
receive data. Since the controller sends data only when TXEMPTY is ready,
on RS485, when DMA is not used, the RTS pin is driven low after each byte.
With this patch, the characters will be transmitted when TXRDY is up and
so, RTS pin will remain high between bytes.
The performance improvement on RS485 is about 8% with a baudrate of 300.

Signed-off-by: default avatarCodrin Ciubotariu <codrin.ciubotariu@microchip.com>
Acked-by: default avatarRichard Genoud <richard.genoud@gmail.com>
Link: https://lore.kernel.org/r/20200107111656.26308-1-codrin.ciubotariu@microchip.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 692a8ebcfc24 ("tty: serial: atmel: Preserve previous USART mode if RS485 disabled")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9ad48cbf

drivers/tty/serial/atmel_serial.c

+19 −7
Original line number Diff line number Diff line
@@ -313,7 +313,11 @@ static int atmel_config_rs485(struct uart_port *port, 


	if (rs485conf->flags & SER_RS485_ENABLED) {

		dev_dbg(port->dev, "Setting UART to RS485\n");

		if (port->rs485.flags & SER_RS485_RX_DURING_TX)

			atmel_port->tx_done_mask = ATMEL_US_TXRDY;

		else

			atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;



		atmel_uart_writel(port, ATMEL_US_TTGR,

				  rs485conf->delay_rts_after_send);

		mode |= ATMEL_US_USMODE_RS485;
@@ -832,7 +836,7 @@ static void atmel_tx_chars(struct uart_port *port) 
	struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);



	if (port->x_char &&

	    (atmel_uart_readl(port, ATMEL_US_CSR) & atmel_port->tx_done_mask)) {

	    (atmel_uart_readl(port, ATMEL_US_CSR) & ATMEL_US_TXRDY)) {

		atmel_uart_write_char(port, port->x_char);

		port->icount.tx++;

		port->x_char = 0;
@@ -840,8 +844,7 @@ static void atmel_tx_chars(struct uart_port *port) 
	if (uart_circ_empty(xmit) || uart_tx_stopped(port))

		return;



	while (atmel_uart_readl(port, ATMEL_US_CSR) &

	       atmel_port->tx_done_mask) {

	while (atmel_uart_readl(port, ATMEL_US_CSR) & ATMEL_US_TXRDY) {

		atmel_uart_write_char(port, xmit->buf[xmit->tail]);

		xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);

		port->icount.tx++;
@@ -852,10 +855,20 @@ static void atmel_tx_chars(struct uart_port *port) 
	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)

		uart_write_wakeup(port);



	if (!uart_circ_empty(xmit))

	if (!uart_circ_empty(xmit)) {

		/* we still have characters to transmit, so we should continue

		 * transmitting them when TX is ready, regardless of

		 * mode or duplexity

		 */

		atmel_port->tx_done_mask |= ATMEL_US_TXRDY;



		/* Enable interrupts */

		atmel_uart_writel(port, ATMEL_US_IER,

				  atmel_port->tx_done_mask);

	} else {

		if (atmel_uart_is_half_duplex(port))

			atmel_port->tx_done_mask &= ~ATMEL_US_TXRDY;

	}

}



static void atmel_complete_tx_dma(void *arg)
@@ -2541,8 +2554,7 @@ static int atmel_init_port(struct atmel_uart_port *atmel_port, 
	 * Use TXEMPTY for interrupt when rs485 or ISO7816 else TXRDY or

	 * ENDTX|TXBUFE

	 */

	if (port->rs485.flags & SER_RS485_ENABLED ||

	    port->iso7816.flags & SER_ISO7816_ENABLED)

	if (atmel_uart_is_half_duplex(port))

		atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;

	else if (atmel_use_pdc_tx(port)) {

		port->fifosize = PDC_BUFFER_SIZE;