Fix 8250 XON/XOFF for DMA-capable devices
cover Fix 8250 XON/XOFF for DMA-capable devices
DMA-capable 8250 was not properly taking XON/XOFF into account right since it was introduced in 2013. There was no attempt to send x_char out at all which is fixed by this patch.
After making this fix, it was further reported by Gilles Buloz that also rx side fails to work as expected if the receiving side is not reading from tty. I took look into that issue and and determined that XOFF char gets stuck in an intermediate buffer until enough data can be processed in receive_buf(). So it's not very useful from flow control perspective :-). While the problem is more likely to occur with DMA, the code does not look robust and the problem can likely occur also w/o DMA.
I was thinking of fixing the rx side issue by adding lookahead. The most natural place to call lookahead handler would seem to be from flush_to_ldisc() in the case when receive_buf() does not eat all characters that were passed to it. Does anybody have other opinions on how it should be fixed?
Ilpo Järvinen (1):
serial: 8250: fix XOFF/XON sending when DMA is used
drivers/tty/serial/8250/8250_dma.c | 11 ++++++++++- drivers/tty/serial/8250/8250_port.c | 4 +--- drivers/tty/serial/serial_core.c | 14 ++++++++++++++ include/linux/serial_core.h | 2 ++ 4 files changed, 27 insertions(+), 4 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/1 serial: 8250: fix XOFF/XON sending when DMA is used
When 8250 UART is using DMA, x_char (XON/XOFF) is never sent to the wire. After this change, x_char is injected correctly.
Create uart_xchar_out() helper for sending the x_char out and accounting related to it. It seems that almost every driver does these same steps with x_char. Except for 8250, however, almost all currently lack .serial_out so they cannot immediately take advantage of this new helper.
The downside of this patch is that it might reintroduce the problems some devices faced with mixed DMA/non-DMA transfer which caused revert f967fc8f165f (Revert "serial: 8250_dma:
don't bother DMA with small transfers"). However, the impact should be limited to cases with XON/XOFF (that didn't work with DMA capable devices to begin with so this problem is not very likely to cause a major issue, if any at all).
--- drivers/tty/serial/8250/8250_dma.c | 11 ++++++++++- drivers/tty/serial/8250/8250_port.c | 4 +--- drivers/tty/serial/serial_core.c | 14 ++++++++++++++ include/linux/serial_core.h | 2 ++ 4 files changed, 27 insertions(+), 4 deletions(-)
drivers/tty/serial/8250/8250_dma.c +10 -1
@@ -64,10 +64,19 @@ int serial8250_tx_dma(struct uart_8250_port *p)struct uart_8250_dma *dma = p->dma;struct circ_buf *xmit = &p->port.state->xmit;struct dma_async_tx_descriptor *desc; +struct uart_port *up = &p->port;int ret; -if (dma->tx_running) +if (dma->tx_running) { +if (up->x_char) { +dmaengine_pause (dma->txchan); +uart_xchar_out (up,UART_TX ); +dmaengine_resume (dma->txchan); + }return 0 ; + }else if (up->x_char) { +uart_xchar_out (up,UART_TX ); + }if (uart_tx_stopped (&p->port) ||uart_circ_empty (xmit)) {/* We have been called from __dma_tx_complete() */
drivers/tty/serial/8250/8250_port.c +1 -3
@@ -1799,9 +1799,7 @@ void serial8250_tx_chars(struct uart_8250_port *up)int count;if (port->x_char) { -serial_out (up,UART_TX , port->x_char); - port->icount.tx++; - port->x_char =0 ; +uart_xchar_out (port,UART_TX );return ; }if (uart_tx_stopped (port)) {
drivers/tty/serial/serial_core.c +14 -0
@@ -644,6 +644,20 @@ static void uart_flush_buffer(struct tty_struct *tty)tty_port_tty_wakeup (&state->port); } +/* +* This function performs low-level write of high-priority XON/XOFF +* character and accounting for it. +* +* Requires uart_port to implement .serial_out(). +*/ +void uart_xchar_out (struct uart_port *uport,int offset) +{ +serial_port_out (uport, offset, uport->x_char); + uport->icount.tx++; + uport->x_char =0 ; +} +EXPORT_SYMBOL_GPL (uart_xchar_out); +/* * This function is used to send a high-priority XON/XOFF character to * the device
include/linux/serial_core.h +2 -0
@@ -458,6 +458,8 @@ extern void uart_handle_cts_change(struct uart_port *uport,extern void uart_insert_char (struct uart_port *port,unsigned int status,unsigned int overrun,unsigned int ch,unsigned int flag); +void uart_xchar_out (struct uart_port *uport,int offset); +#ifdef CONFIG_MAGIC_SYSRQ_SERIAL #define SYSRQ_TIMEOUT (HZ * 5)
Signature · 1 line
2.30.2
Re: [PATCH 1/1] serial: 8250: fix XOFF/XON sending when DMA is used
Quoted 9 lines · Ilpo Järvinen
When 8250 UART is using DMA,
x_char(XON/XOFF) is never sent to the wire. After this change,x_charis injected correctly.Create
uart_xchar_out()helper for sending thex_charout and accounting related to it. It seems that almost every driver does these same steps withx_char. Except for 8250, however, almost all currently lack .serial_out so they cannot immediately take advantage of this new helper.
Quoted 7 lines
The downside of this patch is that it might reintroduce the problems some devices faced with mixed DMA/non-DMA transfer which caused revert
f967fc8f165f(Revert "serial: 8250_dma:
don't bother DMA with small transfers"). However, the impact should be limited to cases with XON/XOFF (that didn't work with DMA capable devices to begin with so this problem is not very likely to cause a major issue, if any at all).
LGTM,
One nit=pick below.
Quoted 23 lines
Reported-by Gilles Buloz <[email protected]>Tested-by Gilles Buloz <[email protected]>Fixes 9ee4b83e51f74 ("serial: 8250: Add support for dmaengine")Signed-off-by Ilpo Järvinen <[email protected]>--- drivers/tty/serial/8250/8250_dma.c | 11 ++++++++++- drivers/tty/serial/8250/8250_port.c | 4 +--- drivers/tty/serial/serial_core.c | 14 ++++++++++++++ include/linux/serial_core.h | 2 ++ 4 files changed, 27 insertions(+), 4 deletions(-)drivers/tty/serial/8250/8250_dma.c +1
-1@@ -64,10 +64,19 @@ int serial8250_tx_dma(struct uart_8250_port *p)struct uart_8250_dma *dma = p->dma;struct circ_buf *xmit = &p->port.state->xmit;struct dma_async_tx_descriptor *desc; +struct uart_port *up = &p->port;int ret; -if (dma->tx_running)
drivers/tty/serial/8250/8250_dma.c int serial8250_tx_dma(struct uart_8250_port *p) · line 79
Quoted 10 lines
drivers/tty/serial/8250/8250_dma.c +9
-0+if (dma->tx_running) { +if (up->x_char) { +dmaengine_pause (dma->txchan); +uart_xchar_out (up,UART_TX ); +dmaengine_resume (dma->txchan); + }return 0 ; + }else if (up->x_char) { +uart_xchar_out (up,UART_TX ); + }
This can be written as
if (dma->tx_running) {
...
return 0;
}
if (up->x_char)
uart_xchar_out(up, UART_TX);But I'm fine with the original code (it might make sense to have redundant 'else' just to keep xON/xOFF handling grouped).
Quoted 58 lines
drivers/tty/serial/8250/8250_dma.c +0
-0if (uart_tx_stopped (&p->port) ||uart_circ_empty (xmit)) {/* We have been called from __dma_tx_complete() */ drivers/tty/serial/8250/8250_port.c +1
-3@@ -1799,9 +1799,7 @@ void serial8250_tx_chars(struct uart_8250_port *up)int count;if (port->x_char) { -serial_out (up,UART_TX , port->x_char); - port->icount.tx++; - port->x_char =0 ; +uart_xchar_out (port,UART_TX );return ; }if (uart_tx_stopped (port)) {drivers/tty/serial/serial_core.c +14
-0@@ -644,6 +644,20 @@ static void uart_flush_buffer(struct tty_struct *tty)tty_port_tty_wakeup (&state->port); } +/* +* This function performs low-level write of high-priority XON/XOFF +* character and accounting for it. +* +* Requires uart_port to implement .serial_out(). +*/ +void uart_xchar_out (struct uart_port *uport,int offset) +{ +serial_port_out (uport, offset, uport->x_char); + uport->icount.tx++; + uport->x_char =0 ; +} +EXPORT_SYMBOL_GPL (uart_xchar_out); +/* * This function is used to send a high-priority XON/XOFF character to * the device include/linux/serial_core.h +2
-0@@ -458,6 +458,8 @@ extern void uart_handle_cts_change(struct uart_port *uport,extern void uart_insert_char (struct uart_port *port,unsigned int status,unsigned int overrun,unsigned int ch,unsigned int flag); +void uart_xchar_out (struct uart_port *uport,int offset); +#ifdef CONFIG_MAGIC_SYSRQ_SERIAL #define SYSRQ_TIMEOUT (HZ * 5)Signature · 1 line
2.30.2
Signature · 2 lines
With Best Regards, Andy Shevchenko