serial: sh-sci: Fix receive on SCIFA/SCIFB variants with DMA

geertu · gregkh · commit 202dc3cc10b4 · 2018-10-15T16:20:24.000+02:00
On SCIFA and SCIFB serial ports with DMA support (i.e. some ports on R-Car Gen2 and RZ/G1 SoCs), receive DMA operations are submitted before the DMA channel pointer is initialized. Hence this fails, and the driver tries to fall back to PIO. However, at this early phase in the initialization sequence, fallback to PIO does not work, leading to a serial port that cannot receive any data. Fix this by calling sci_submit_rx() after initialization of the DMA channel pointer. Reported-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Fixes: 2c4ee23 ("serial: sh-sci: Postpone DMA release when falling back to PIO") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
@@ -1614,10 +1614,10 @@ static void sci_request_dma(struct uart_port *port)
 		hrtimer_init(&s->rx_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 		s->rx_timer.function = rx_timer_fn;
 
+		s->chan_rx_saved = s->chan_rx = chan;
+
 		if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
 			sci_submit_rx(s);
-
-		s->chan_rx_saved = s->chan_rx = chan;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1614,10 +1614,10 @@ static void sci_request_dma(struct uart_port *port)`
`1614`	`1614`	`hrtimer_init(&s->rx_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);`
`1615`	`1615`	`s->rx_timer.function = rx_timer_fn;`
`1616`	`1616`
	`1617`	`+ s->chan_rx_saved = s->chan_rx = chan;`
	`1618`	`+`
`1617`	`1619`	`if (port->type == PORT_SCIFA \|\| port->type == PORT_SCIFB)`
`1618`	`1620`	`sci_submit_rx(s);`
`1619`		`-`
`1620`		`- s->chan_rx_saved = s->chan_rx = chan;`
`1621`	`1621`	`}`
`1622`	`1622`	`}`
`1623`	`1623`