Skip to content

Commit 0aa821d

Browse files
agnersgregkh
authored andcommitted
serial: imx: fix cached UCR2 read on software reset
To reset the UART the SRST needs be cleared (low active). According to the documentation the bit will remain active for 4 module clocks until it is cleared (set to 1). Hence the real register need to be read in case the cached register indicates that the SRST bit is zero. This bug lead to wrong baudrate because the baud rate register got restored before reset completed in imx_flush_buffer. Fixes: 3a0ab62 ("serial: imx: implement shadow registers for UCRx and UFCR") Signed-off-by: Stefan Agner <[email protected]> Reviewed-by: Fabio Estevam <[email protected]> Reviewed-by: Uwe Kleine-König <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 6d215f8 commit 0aa821d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/tty/serial/imx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ static u32 imx_uart_readl(struct imx_port *sport, u32 offset)
316316
* differ from the value that was last written. As it only
317317
* clears after being set, reread conditionally.
318318
*/
319-
if (sport->ucr2 & UCR2_SRST)
319+
if (!(sport->ucr2 & UCR2_SRST))
320320
sport->ucr2 = readl(sport->port.membase + offset);
321321
return sport->ucr2;
322322
break;

0 commit comments

Comments
 (0)