random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 12:56:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

arm: vf610: lpuart: fix status register handling

Browse Source 
The status register 1 (S1) is not writeable, hence we should not
write it. In order to clear the RDRF flag we only need to read
the data register.

Also, when stressing U-Boot a lot with serial input, an overflow can
occur which asserts the S1_OR flag (while not asserting the S1_RDRF
flag). To clear this flag we again just need to read the data
register, hence add this flag to the abort conditions for the while
loop.

Insert a compiler barrier to make sure reading the data register
gets executed after reading the status register.

Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Stefan Agner 2014-08-19 17:54:27 +02:00 committed by Stefano Babic
parent 2d59e3ecd2
commit a3db78d887
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/serial/serial_lpuart.c
View File

@ -14,6 +14,7 @@
#define US1_TDRE (1 << 7) #define US1_TDRE (1 << 7)
#define US1_RDRF (1 << 5) #define US1_RDRF (1 << 5)
#define US1_OR (1 << 3)
#define UC2_TE (1 << 3) #define UC2_TE (1 << 3)
#define UC2_RE (1 << 2) #define UC2_RE (1 << 2)
@ -38,14 +39,10 @@ static void lpuart_serial_setbrg(void)
static int lpuart_serial_getc(void) static int lpuart_serial_getc(void)
{ {
u8 status; while (!(__raw_readb(&base->us1) & (US1_RDRF | US1_OR)))
while (!(__raw_readb(&base->us1) & US1_RDRF))
WATCHDOG_RESET(); WATCHDOG_RESET();
status = __raw_readb(&base->us1); barrier();
status |= US1_RDRF;
__raw_writeb(status, &base->us1);
return __raw_readb(&base->ud); return __raw_readb(&base->ud);
} }