Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1481095

[PATCHv2 3/3] tty/serial: at91: fix hardware handshake on SAM9x5 (without GPIOs)

Show all headers | View raw

Commit 1cf6e8fc8341 ("tty/serial: at91: fix RTS line management when
hardware handshake is enabled") broke the hardware handshake on SAM9x5
platforms.

On Atmel platforms, the USART can only handle the handware handshake
(ATMEL_US_USMODE_HWHS) if FIFOs or PDC are used.

Thus, ATMEL_US_USMODE_HWHS mode should only be used in this case.

For SAM9x5, there's no FIFOs nor PDC for the USART, so the mode should
be ATMEL_US_USMODE_NORMAL and the RTS pin should be controlled by the
driver.

NB: -stable is not Cced because it doesn't cleanly apply on 4.1+

Tested on SAM9G35-CM with and without DMA

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Fixes: 1cf6e8fc8341 ("tty/serial: at91: fix RTS line management when hardware handshake is enabled")
---
 drivers/tty/serial/atmel_serial.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index e9b4fbf88c2d..32154e7231ce 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -2130,15 +2130,19 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
 	} else if ((termios->c_cflag & CRTSCTS) &&
 		   !mctrl_gpio_use_rtscts(atmel_port->gpios)) {
 		/*
-		 * RS232 with hardware handshake (RTS/CTS)
-		 * handled by the controller.
+		 * Automatic hardware handshake (RTS/CTS) only work with
+		 * FIFOs or PDC.
+		 * Meaning that on SAM9x5 the controller can't handle
+		 * the hardware handshake (no FIFOs nor PDC on these platforms).
 		 */
-		if (atmel_use_dma_rx(port) && !atmel_use_fifo(port)) {
-			dev_info(port->dev, "not enabling hardware flow control because DMA is used");
-			termios->c_cflag &= ~CRTSCTS;
-		} else {
+		if (atmel_use_pdc_rx(port) || atmel_use_fifo(port))
 			mode |= ATMEL_US_USMODE_HWHS;
-		}
+		else
+			/*
+			 * The hardware handshake won't be handle by the
+			 * controller but by the driver.
+			 */
+			mode |= ATMEL_US_USMODE_NORMAL;
 	} else {
 		/* RS232 without hadware handshake or controlled by GPIOs */
 		mode |= ATMEL_US_USMODE_NORMAL;

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCHv2 0/3] Fix handware handshake on SAM9x5 platforms Richard Genoud <richard.genoud@gmail.com> - 2016-09-12 11:50 +0200
  [PATCHv2 2/3] tty/serial: at91: fix hardware handshake with GPIOs Richard Genoud <richard.genoud@gmail.com> - 2016-09-12 11:50 +0200
    Re: [PATCHv2 2/3] tty/serial: at91: fix hardware handshake with GPIOs Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-09-22 11:50 +0200
    Re: [PATCHv2 2/3] tty/serial: at91: fix hardware handshake with GPIOs Uwe Kleine-König          <u.kleine-koenig@pengutronix.de> - 2016-09-22 15:30 +0200
  [PATCHv2 1/3] serial: mctrl_gpio: implement mctrl_gpio_use_rtscts Richard Genoud <richard.genoud@gmail.com> - 2016-09-12 11:50 +0200
    Re: [PATCHv2 1/3] serial: mctrl_gpio: implement mctrl_gpio_use_rtscts Uwe Kleine-König          <u.kleine-koenig@pengutronix.de> - 2016-09-22 15:20 +0200
  [PATCHv2 3/3] tty/serial: at91: fix hardware handshake on SAM9x5 (without GPIOs) Richard Genoud <richard.genoud@gmail.com> - 2016-09-12 11:50 +0200
    Re: [PATCHv2 3/3] tty/serial: at91: fix hardware handshake on SAM9x5  (without GPIOs) Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-09-12 12:00 +0200
      Re: [PATCHv2 3/3] tty/serial: at91: fix hardware handshake on SAM9x5  (without GPIOs) Richard Genoud <richard.genoud@gmail.com> - 2016-09-12 13:00 +0200
        Re: [PATCHv2 3/3] tty/serial: at91: fix hardware handshake on SAM9x5  (without GPIOs) Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-09-13 15:50 +0200
          Re: [PATCHv2 3/3] tty/serial: at91: fix hardware handshake on SAM9x5  (without GPIOs) Richard Genoud <richard.genoud@gmail.com> - 2016-09-14 12:40 +0200

csiph-web