From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 19 Aug 2024 04:24:22 +0000 (+0200)
Subject: 6.1-stable patches
X-Git-Tag: v6.1.107~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e21402fd7cab7de217f6be7aff3024a6fe87431;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	series
	tty-atmel_serial-use-the-correct-rts-flag.patch
---

diff --git a/queue-6.1/series b/queue-6.1/series
new file mode 100644
index 00000000000..1e84452ef00
--- /dev/null
+++ b/queue-6.1/series
@@ -0,0 +1 @@
+tty-atmel_serial-use-the-correct-rts-flag.patch
diff --git a/queue-6.1/tty-atmel_serial-use-the-correct-rts-flag.patch b/queue-6.1/tty-atmel_serial-use-the-correct-rts-flag.patch
new file mode 100644
index 00000000000..5e878a0ff1f
--- /dev/null
+++ b/queue-6.1/tty-atmel_serial-use-the-correct-rts-flag.patch
@@ -0,0 +1,43 @@
+From c9f6613b16123989f2c3bd04b1d9b2365d6914e7 Mon Sep 17 00:00:00 2001
+From: Mathieu Othacehe <othacehe@gnu.org>
+Date: Thu, 8 Aug 2024 08:06:37 +0200
+Subject: tty: atmel_serial: use the correct RTS flag.
+
+From: Mathieu Othacehe <othacehe@gnu.org>
+
+commit c9f6613b16123989f2c3bd04b1d9b2365d6914e7 upstream.
+
+In RS485 mode, the RTS pin is driven high by hardware when the transmitter
+is operating. This behaviour cannot be changed. This means that the driver
+should claim that it supports SER_RS485_RTS_ON_SEND and not
+SER_RS485_RTS_AFTER_SEND.
+
+Otherwise, when configuring the port with the SER_RS485_RTS_ON_SEND, one
+get the following warning:
+
+kern.warning kernel: atmel_usart_serial atmel_usart_serial.2.auto:
+ttyS1 (1): invalid RTS setting, using RTS_AFTER_SEND instead
+
+which is contradictory with what's really happening.
+
+Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
+Cc: stable <stable@kernel.org>
+Tested-by: Alexander Dahl <ada@thorsis.com>
+Fixes: af47c491e3c7 ("serial: atmel: Fill in rs485_supported")
+Link: https://lore.kernel.org/r/20240808060637.19886-1-othacehe@gnu.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/tty/serial/atmel_serial.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/tty/serial/atmel_serial.c
++++ b/drivers/tty/serial/atmel_serial.c
+@@ -2539,7 +2539,7 @@ static const struct uart_ops atmel_pops
+ };
+ 
+ static const struct serial_rs485 atmel_rs485_supported = {
+-	.flags = SER_RS485_ENABLED | SER_RS485_RTS_AFTER_SEND | SER_RS485_RX_DURING_TX,
++	.flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | SER_RS485_RX_DURING_TX,
+ 	.delay_rts_before_send = 1,
+ 	.delay_rts_after_send = 1,
+ };