tty: serial: imx: allow breaks to be received when using dma
Subsystems (2)
PATCH v2 1/1 tty: serial: imx: allow breaks to be received when using dma
This allows me to login after sending a break when service serial-getty at ttymxc0.service is running
Signed-off-by Troy Kisky <[email protected]>
---
v2: rebase only
drivers/tty/serial/imx.c +13 -7
@@ -927,7 +927,6 @@ static void dma_rx_callback(void *data) status =dmaengine_tx_status (chan, (dma_cookie_t )0 , &state);if (status ==DMA_ERROR ) { -dev_err (sport->port.dev,"DMA transaction error.\n" );clear_rx_errors (sport);return ; }
@@ -1028,6 +1027,7 @@ static int start_rx_dma(struct imx_port *sport)static void clear_rx_errors (struct imx_port *sport) { +struct tty_port *port = &sport->port.state->port;unsigned int status_usr1, status_usr2; status_usr1 =readl (sport->port.membase +USR1 );
@@ -1036,12 +1036,18 @@ static void clear_rx_errors(struct imx_port *sport)if (status_usr2 &USR2_BRCD ) { sport->port.icount.brk++;writel (USR2_BRCD , sport->port.membase +USR2 ); - }else if (status_usr1 &USR1_FRAMERR ) { - sport->port.icount.frame++; -writel (USR1_FRAMERR , sport->port.membase +USR1 ); - }else if (status_usr1 &USR1_PARITYERR ) { - sport->port.icount.parity++; -writel (USR1_PARITYERR , sport->port.membase +USR1 ); +if (tty_insert_flip_char (port,0 ,TTY_BREAK ) ==0 ) + sport->port.icount.buf_overrun++; +tty_flip_buffer_push (port); + }else { +dev_err (sport->port.dev,"DMA transaction error.\n" ); +if (status_usr1 &USR1_FRAMERR ) { + sport->port.icount.frame++; +writel (USR1_FRAMERR , sport->port.membase +USR1 ); + }else if (status_usr1 &USR1_PARITYERR ) { + sport->port.icount.parity++; +writel (USR1_PARITYERR , sport->port.membase +USR1 ); + } }if (status_usr2 &USR2_ORE ) {
Signature · 1 line
2.14.1
Fabio Estevam
reviewerPATCH v2 1/1 tty: serial: imx: allow breaks to be received when using dma
Hi Troy,
Quoted 2 lines · Troy Kisky
This allows me to login after sending a break when service serial-getty at ttymxc0.service is running
Please improve the commit log by explaining why this patch fixes the issue.
Thanks
PATCH v2 1/1 tty: serial: imx: allow breaks to be received when using dma
In reply to Troy KiskyQuoted 4 lines · Troy Kisky
This allows me to login after sending a break when service serial-getty at ttymxc0.service is running
Signed-off-by Troy Kisky <[email protected]>
Tested-by Martin Hicks <[email protected]>
Works for me.
mh
Quoted 52 lines
---
v2: rebase onlydrivers/tty/serial/imx.c +13
-7@@ -927,7 +927,6 @@ static void dma_rx_callback(void *data) status =dmaengine_tx_status (chan, (dma_cookie_t )0 , &state);if (status ==DMA_ERROR ) { -dev_err (sport->port.dev,"DMA transaction error.\n" );clear_rx_errors (sport);return ; }@@ -1028,6 +1027,7 @@ static int start_rx_dma(struct imx_port *sport)static void clear_rx_errors (struct imx_port *sport) { +struct tty_port *port = &sport->port.state->port;unsigned int status_usr1, status_usr2; status_usr1 =readl (sport->port.membase +USR1 );@@ -1036,12 +1036,18 @@ static void clear_rx_errors(struct imx_port *sport)if (status_usr2 &USR2_BRCD ) { sport->port.icount.brk++;writel (USR2_BRCD , sport->port.membase +USR2 ); - }else if (status_usr1 &USR1_FRAMERR ) { - sport->port.icount.frame++; -writel (USR1_FRAMERR , sport->port.membase +USR1 ); - }else if (status_usr1 &USR1_PARITYERR ) { - sport->port.icount.parity++; -writel (USR1_PARITYERR , sport->port.membase +USR1 ); +if (tty_insert_flip_char (port,0 ,TTY_BREAK ) ==0 ) + sport->port.icount.buf_overrun++; +tty_flip_buffer_push (port); + }else { +dev_err (sport->port.dev,"DMA transaction error.\n" ); +if (status_usr1 &USR1_FRAMERR ) { + sport->port.icount.frame++; +writel (USR1_FRAMERR , sport->port.membase +USR1 ); + }else if (status_usr1 &USR1_PARITYERR ) { + sport->port.icount.parity++; +writel (USR1_PARITYERR , sport->port.membase +USR1 ); + } }if (status_usr2 &USR2_ORE ) {Signature · 1 line
2.14.1
Signature · 2 lines
Martin Hicks P.Eng. | mort at bork.org Bork Consulting Inc. | +1 (613) 266-2296