| Message ID | AM0PR09MB26758F651BC1B742EB45775995B8A@AM0PR09MB2675.eurprd09.prod.outlook.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] serial: imx: fix tx statemachine deadlock | expand |
On 24/11/2023 14.37, Rasmus Villemoes wrote: > On 24/11/2023 14.11, Paul Geurts wrote: >> When using the serial port as RS485 port, the tx statemachine is used to >> control the RTS pin to drive the RS485 transceiver TX_EN pin. When the >> TTY port is closed in the middle of a transmission (for instance during >> userland application crash), imx_uart_shutdown disables the interface >> and disables the Transmission Complete interrupt. afer that, >> imx_uart_stop_tx bails on an incomplete transmission, to be retriggered >> by the TC interrupt. This interrupt is disabled and therefore the tx >> statemachine never transitions out of SEND. The statemachine is in >> deadlock now, and the TX_EN remains low, making the interface useless. >> >> imx_uart_stop_tx now checks for incomplete transmission AND whether TC >> interrupts are enabled before bailing to be retriggered. This makes sure >> the state machine handling is reached, and is properly set to >> WAIT_AFTER_SEND. >> >> Fixes: cb1a60923609 ("serial: imx: implement rts delaying for rs485") >> Signed-off-by: Paul Geurts <paul_geurts@live.nl> > > Hi Paul > > Interestingly, both Eberhard (cc'ed) and I have hit similar problems in > this driver recently. See the thread > https://lore.kernel.org/lkml/20231120132256.136625-1-rasmus.villemoes@prevas.dk/ > . > > It is possible that this also fixes the problems I/we saw, but I can't > get around to testing until sometime next week. This also seems to fix the problem I had when switching to rs232 and back to rs485, and I agree that it seems to be a cleaner fix than mine. I also tried reproducing what Eberhard reported, and I think I managed to do that, and at least my way of reproducing the tx lockup also seems to be fixed by this patch. Eberhard, can you test this patch in your setup? In any case, Tested-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Rasmus
On 30.11.23 10:09, Rasmus Villemoes wrote: > On 24/11/2023 14.37, Rasmus Villemoes wrote: >> On 24/11/2023 14.11, Paul Geurts wrote: >>> When using the serial port as RS485 port, the tx statemachine is used to >>> control the RTS pin to drive the RS485 transceiver TX_EN pin. When the >>> TTY port is closed in the middle of a transmission (for instance during >>> userland application crash), imx_uart_shutdown disables the interface >>> and disables the Transmission Complete interrupt. afer that, >>> imx_uart_stop_tx bails on an incomplete transmission, to be retriggered >>> by the TC interrupt. This interrupt is disabled and therefore the tx >>> statemachine never transitions out of SEND. The statemachine is in >>> deadlock now, and the TX_EN remains low, making the interface useless. >>> >>> imx_uart_stop_tx now checks for incomplete transmission AND whether TC >>> interrupts are enabled before bailing to be retriggered. This makes sure >>> the state machine handling is reached, and is properly set to >>> WAIT_AFTER_SEND. >>> >>> Fixes: cb1a60923609 ("serial: imx: implement rts delaying for rs485") >>> Signed-off-by: Paul Geurts <paul_geurts@live.nl> >> >> Hi Paul >> >> Interestingly, both Eberhard (cc'ed) and I have hit similar problems in >> this driver recently. See the thread >> https://lore.kernel.org/lkml/20231120132256.136625-1-rasmus.villemoes@prevas.dk/ >> . >> >> It is possible that this also fixes the problems I/we saw, but I can't >> get around to testing until sometime next week. > > This also seems to fix the problem I had when switching to rs232 and > back to rs485, and I agree that it seems to be a cleaner fix than mine. > > I also tried reproducing what Eberhard reported, and I think I managed > to do that, and at least my way of reproducing the tx lockup also seems > to be fixed by this patch. Eberhard, can you test this patch in your setup? > > In any case, > > Tested-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> > > Rasmus > Yes, it also works for my test setup! Tested-by: Eberhard Stoll <eberhard.stoll@gmx.de> Best regards Eberhard
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 708b9852a575..ad36c49c7898 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -415,13 +415,13 @@ static void imx_uart_stop_tx(struct uart_port *port) ucr1 = imx_uart_readl(sport, UCR1); imx_uart_writel(sport, ucr1 & ~UCR1_TRDYEN, UCR1); + ucr4 = imx_uart_readl(sport, UCR4); usr2 = imx_uart_readl(sport, USR2); - if (!(usr2 & USR2_TXDC)) { + if ((!(usr2 & USR2_TXDC)) && (ucr4 & UCR4_TCEN)) { /* The shifter is still busy, so retry once TC triggers */ return; } - ucr4 = imx_uart_readl(sport, UCR4); ucr4 &= ~UCR4_TCEN; imx_uart_writel(sport, ucr4, UCR4);
When using the serial port as RS485 port, the tx statemachine is used to control the RTS pin to drive the RS485 transceiver TX_EN pin. When the TTY port is closed in the middle of a transmission (for instance during userland application crash), imx_uart_shutdown disables the interface and disables the Transmission Complete interrupt. afer that, imx_uart_stop_tx bails on an incomplete transmission, to be retriggered by the TC interrupt. This interrupt is disabled and therefore the tx statemachine never transitions out of SEND. The statemachine is in deadlock now, and the TX_EN remains low, making the interface useless. imx_uart_stop_tx now checks for incomplete transmission AND whether TC interrupts are enabled before bailing to be retriggered. This makes sure the state machine handling is reached, and is properly set to WAIT_AFTER_SEND. Fixes: cb1a60923609 ("serial: imx: implement rts delaying for rs485") Signed-off-by: Paul Geurts <paul_geurts@live.nl> --- V1 -> V2: Added fixes line to the commit message V2 -> V3: Fixed up the fixes line by using the correct format drivers/tty/serial/imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)