FAILED: patch "[PATCH] tty: serial: imx: Fix broken RS485" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 672448ccf9b6a676f96f9352cbf91f4d35f4084a
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024032746-stilt-vaporizer-fb22@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
672448ccf9b6 ("tty: serial: imx: Fix broken RS485")ca530cfa968c ("serial: imx: Add support for RS485 RX_DURING_TX output GPIO") 79d0224f6bf2 ("tty: serial: imx: Handle RS485 DE signal active high")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 672448ccf9b6a676f96f9352cbf91f4d35f4084a Mon Sep 17 00:00:00 2001
From: Rickard x Andersson <[email protected]>
Date: Wed, 21 Feb 2024 12:53:04 +0100
Subject: [PATCH] tty: serial: imx: Fix broken RS485
When about to transmit the function imx_uart_start_tx is called and in some RS485 configurations this function will call imx_uart_stop_rx. The problem is that imx_uart_stop_rx will enable loopback in order to release the RS485 bus, but when loopback is enabled transmitted data will just be looped to RX.
This patch fixes the above problem by not enabling loopback when about to transmit.
This driver now works well when used for RS485 half duplex master configurations.
drivers/tty/serial/imx.c +18 -4
@@ -462,8 +462,7 @@ static void imx_uart_stop_tx(struct uart_port *port) } } -/* called with port.lock taken and irqs off */ -static void imx_uart_stop_rx (struct uart_port *port) +static void imx_uart_stop_rx_with_loopback_ctrl (struct uart_port *port,bool loopback) {struct imx_port *sport = (struct imx_port *)port;u32 ucr1, ucr2, ucr4, uts;
@@ -485,7 +484,7 @@ static void imx_uart_stop_rx(struct uart_port *port)/* See SER_RS485_ENABLED/UTS_LOOP comment in imx_uart_probe() */ if (port->rs485.flags &SER_RS485_ENABLED && port->rs485.flags &SER_RS485_RTS_ON_SEND && - sport->have_rtscts && !sport->have_rtsgpio) { + sport->have_rtscts && !sport->have_rtsgpio && loopback) { uts =imx_uart_readl (sport,imx_uart_uts_reg (sport)); uts |=UTS_LOOP ;imx_uart_writel (sport, uts,imx_uart_uts_reg (sport));
@@ -497,6 +496,16 @@ static void imx_uart_stop_rx(struct uart_port *port)imx_uart_writel (sport, ucr2,UCR2 ); } +/* called with port.lock taken and irqs off */ +static void imx_uart_stop_rx (struct uart_port *port) +{ +/* +* Stop RX and enable loopback in order to make sure RS485 bus +* is not blocked. Se comment in imx_uart_probe(). +*/ +imx_uart_stop_rx_with_loopback_ctrl (port, true); +} +/* called with port.lock taken and irqs off */ static void imx_uart_enable_ms (struct uart_port *port) {
@@ -682,9 +691,14 @@ static void imx_uart_start_tx(struct uart_port *port)imx_uart_rts_inactive (sport, &ucr2);imx_uart_writel (sport, ucr2,UCR2 ); +/* +* Since we are about to transmit we can not stop RX +* with loopback enabled because that will make our +* transmitted data being just looped to RX. +*/ if (!(port->rs485.flags &SER_RS485_RX_DURING_TX ) && !port->rs485_rx_during_tx_gpio) -imx_uart_stop_rx (port); +imx_uart_stop_rx_with_loopback_ctrl (port, false); sport->tx_state =WAIT_AFTER_RTS ;
PATCH 1/1 tty: serial: imx: Fix broken RS485
From: Rickard x Andersson <[email protected]>
When about to transmit the function imx_uart_start_tx is called and in some RS485 configurations this function will call imx_uart_stop_rx. The problem is that imx_uart_stop_rx will enable loopback in order to release the RS485 bus, but when loopback is enabled transmitted data will just be looped to RX.
This patch fixes the above problem by not enabling loopback when about to transmit.
This driver now works well when used for RS485 half duplex master configurations.
--- drivers/tty/serial/imx.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/tty/serial/imx.c +18 -4
@@ -496,8 +496,7 @@ static void imx_uart_stop_tx(struct uart_port *port) } } -/* called with port.lock taken and irqs off */ -static void imx_uart_stop_rx (struct uart_port *port) +static void imx_uart_stop_rx_with_loopback_ctrl (struct uart_port *port,bool loopback) {struct imx_port *sport = (struct imx_port *)port;u32 ucr1, ucr2, ucr4, uts;
@@ -519,7 +518,7 @@ static void imx_uart_stop_rx(struct uart_port *port)/* See SER_RS485_ENABLED/UTS_LOOP comment in imx_uart_probe() */ if (port->rs485.flags &SER_RS485_ENABLED && port->rs485.flags &SER_RS485_RTS_ON_SEND && - sport->have_rtscts && !sport->have_rtsgpio) { + sport->have_rtscts && !sport->have_rtsgpio && loopback) { uts =imx_uart_readl (sport,imx_uart_uts_reg (sport)); uts |=UTS_LOOP ;imx_uart_writel (sport, uts,imx_uart_uts_reg (sport));
@@ -532,6 +531,16 @@ static void imx_uart_stop_rx(struct uart_port *port) }/* called with port.lock taken and irqs off */ +static void imx_uart_stop_rx (struct uart_port *port) +{ +/* +* Stop RX and enable loopback in order to make sure RS485 bus +* is not blocked. Se comment in imx_uart_probe(). +*/ +imx_uart_stop_rx_with_loopback_ctrl (port, true); +} + +/* called with port.lock taken and irqs off */ static void imx_uart_enable_ms (struct uart_port *port) {struct imx_port *sport = (struct imx_port *)port;
@@ -719,8 +728,13 @@ static void imx_uart_start_tx(struct uart_port *port)imx_uart_rts_inactive (sport, &ucr2);imx_uart_writel (sport, ucr2,UCR2 ); +/* +* Since we are about to transmit we can not stop RX +* with loopback enabled because that will make our +* transmitted data being just looped to RX. +*/ if (!(port->rs485.flags &SER_RS485_RX_DURING_TX )) -imx_uart_stop_rx (port); +imx_uart_stop_rx_with_loopback_ctrl (port, false); sport->tx_state =WAIT_AFTER_RTS ;
Signature · 1 line
2.11.0
Greg Kroah-Hartman
maintainerRe: [PATCH 6.1.y] tty: serial: imx: Fix broken RS485
Quoted 22 lines · Christoph Niedermaier
From: Rickard x Andersson <[email protected]>
When about to transmit the function
imx_uart_start_txis called and in some RS485 configurations this function will callimx_uart_stop_rx. The problem is thatimx_uart_stop_rxwill enable loopback in order to release the RS485 bus, but when loopback is enabled transmitted data will just be looped to RX.This patch fixes the above problem by not enabling loopback when about to transmit.
This driver now works well when used for RS485 half duplex master configurations.
Fixes 79d0224f6bf2 ("tty: serial: imx: Handle RS485 DE signal active high")Cc stable <[email protected]>Signed-off-by Rickard x Andersson <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>(cherry picked from commit 672448ccf9b6a676f96f9352cbf91f4d35f4084a)Signed-off-by Christoph Niedermaier <[email protected]>
Quoted 3 lines
--- drivers/tty/serial/imx.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
Both now queued up, thanks!
greg k-h