Commit cab53dc9 authored Mar 13, 2014 by Dimitris Lampridis Committed by Greg Kroah-Hartman Mar 17, 2014

tty/serial: omap: fix RX interrupt enable/disable in half-duplex TX



Make sure that serial_omap_stop_rx() also disables RDI (Receiver Data Interrupt),
otherwise the interrupt handler will call serial_omap_rdi() to read the new data,
resulting in the transmission being echoed back.

When the half-duplex transmission is complete, in order to reverse the effects of
serial_omap_stop_rx(), we should re-enable:

  * the RX interrupts _without_ overwriting up->ier

  * the UART_LSR_DR bit of the up->port.read_status_mask

Signed-off-by: Dimitris Lampridis <dlampridis@logikonlabs.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9b971cd2

drivers/tty/serial/omap-serial.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -342,7 +342,8 @@ static void serial_omap_stop_tx(struct uart_port *port)

		if ((up->rs485.flags & SER_RS485_ENABLED) &&
		!(up->rs485.flags & SER_RS485_RX_DURING_TX)) {
		up->ier = UART_IER_RLSI \| UART_IER_RDI;
		up->ier \|= UART_IER_RLSI \| UART_IER_RDI;
		up->port.read_status_mask \|= UART_LSR_DR;
		serial_out(up, UART_IER, up->ier);
		}

		@@ -355,7 +356,7 @@ static void serial_omap_stop_rx(struct uart_port *port)
		struct uart_omap_port *up = to_uart_omap_port(port);

		pm_runtime_get_sync(up->dev);
		up->ier &= ~UART_IER_RLSI;
		up->ier &= ~(UART_IER_RLSI \| UART_IER_RDI);
		up->port.read_status_mask &= ~UART_LSR_DR;
		serial_out(up, UART_IER, up->ier);
		pm_runtime_mark_last_busy(up->dev);