Commit e2e230cc authored by Razvan Stefanescu's avatar Razvan Stefanescu Committed by Stefan Bader

tty/serial: atmel: Add is_half_duplex helper

BugLink: https://bugs.launchpad.net/bugs/1828420

commit f3040983 upstream.

Use a helper function to check that a port needs to use half duplex
communication, replacing several occurrences of multi-line bit checking.

Fixes: b389f173 ("tty/serial: atmel: RS485 half duplex w/DMA: enable RX after TX is done")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarRazvan Stefanescu <razvan.stefanescu@microchip.com>
Acked-by: default avatarRichard Genoud <richard.genoud@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent f286315f
...@@ -237,6 +237,12 @@ static inline void atmel_uart_write_char(struct uart_port *port, u8 value) ...@@ -237,6 +237,12 @@ static inline void atmel_uart_write_char(struct uart_port *port, u8 value)
#endif #endif
static inline int atmel_uart_is_half_duplex(struct uart_port *port)
{
return (port->rs485.flags & SER_RS485_ENABLED) &&
!(port->rs485.flags & SER_RS485_RX_DURING_TX);
}
#ifdef CONFIG_SERIAL_ATMEL_PDC #ifdef CONFIG_SERIAL_ATMEL_PDC
static bool atmel_use_pdc_rx(struct uart_port *port) static bool atmel_use_pdc_rx(struct uart_port *port)
{ {
...@@ -481,9 +487,9 @@ static void atmel_stop_tx(struct uart_port *port) ...@@ -481,9 +487,9 @@ static void atmel_stop_tx(struct uart_port *port)
/* Disable interrupts */ /* Disable interrupts */
atmel_uart_writel(port, ATMEL_US_IDR, atmel_port->tx_done_mask); atmel_uart_writel(port, ATMEL_US_IDR, atmel_port->tx_done_mask);
if ((port->rs485.flags & SER_RS485_ENABLED) && if (atmel_uart_is_half_duplex(port))
!(port->rs485.flags & SER_RS485_RX_DURING_TX))
atmel_start_rx(port); atmel_start_rx(port);
} }
/* /*
...@@ -500,8 +506,7 @@ static void atmel_start_tx(struct uart_port *port) ...@@ -500,8 +506,7 @@ static void atmel_start_tx(struct uart_port *port)
return; return;
if (atmel_use_pdc_tx(port) || atmel_use_dma_tx(port)) if (atmel_use_pdc_tx(port) || atmel_use_dma_tx(port))
if ((port->rs485.flags & SER_RS485_ENABLED) && if (atmel_uart_is_half_duplex(port))
!(port->rs485.flags & SER_RS485_RX_DURING_TX))
atmel_stop_rx(port); atmel_stop_rx(port);
if (atmel_use_pdc_tx(port)) if (atmel_use_pdc_tx(port))
...@@ -810,8 +815,7 @@ static void atmel_complete_tx_dma(void *arg) ...@@ -810,8 +815,7 @@ static void atmel_complete_tx_dma(void *arg)
*/ */
if (!uart_circ_empty(xmit)) if (!uart_circ_empty(xmit))
tasklet_schedule(&atmel_port->tasklet); tasklet_schedule(&atmel_port->tasklet);
else if ((port->rs485.flags & SER_RS485_ENABLED) && else if (atmel_uart_is_half_duplex(port)) {
!(port->rs485.flags & SER_RS485_RX_DURING_TX)) {
/* DMA done, stop TX, start RX for RS485 */ /* DMA done, stop TX, start RX for RS485 */
atmel_start_rx(port); atmel_start_rx(port);
} }
...@@ -1388,8 +1392,7 @@ static void atmel_tx_pdc(struct uart_port *port) ...@@ -1388,8 +1392,7 @@ static void atmel_tx_pdc(struct uart_port *port)
atmel_uart_writel(port, ATMEL_US_IER, atmel_uart_writel(port, ATMEL_US_IER,
atmel_port->tx_done_mask); atmel_port->tx_done_mask);
} else { } else {
if ((port->rs485.flags & SER_RS485_ENABLED) && if (atmel_uart_is_half_duplex(port)) {
!(port->rs485.flags & SER_RS485_RX_DURING_TX)) {
/* DMA done, stop TX, start RX for RS485 */ /* DMA done, stop TX, start RX for RS485 */
atmel_start_rx(port); atmel_start_rx(port);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment