andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #534 from jcastillo-arm/jc/fix_pl011 

Fix potential deadlock in PL011 init function
This commit is contained in:
danh-arm 2016-02-26 09:45:20 +00:00
parent 9931932bfd 8dadabd288
commit d698ee7f8c
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/arm/pl011/pl011_console.S
View File

@ -69,15 +69,6 @@ func console_core_init
mov w4, #PL011_UARTCR_UARTEN
bic w3, w3, w4
str w3, [x0, #UARTCR]
/* Flush the transmit FIFO */
ldr w3, [x0, #UARTLCR_H]
mov w4, #PL011_UARTLCR_H_FEN
bic w3, w3, w4
str w3, [x0, #UARTLCR_H]
/* Wait for the end of Tx of current character */
busy_loop:
ldr w3, [x0, #UARTFR]
tbnz w3, #PL011_UARTFR_BUSY_BIT, busy_loop
/* Program the baudrate */
/* Divisor = (Uart clock * 4) / baudrate */
lsl w1, w1, #2