Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
d698ee7f
Commit
d698ee7f
authored
Feb 26, 2016
by
danh-arm
Browse files
Merge pull request #534 from jcastillo-arm/jc/fix_pl011
Fix potential deadlock in PL011 init function
parents
9931932b
8dadabd2
Changes
1
Hide whitespace changes
Inline
Side-by-side
drivers/arm/pl011/pl011_console.S
View file @
d698ee7f
...
@@ -69,15 +69,6 @@ func console_core_init
...
@@ -69,15 +69,6 @@ func console_core_init
mov
w4
,
#
PL011_UARTCR_UARTEN
mov
w4
,
#
PL011_UARTCR_UARTEN
bic
w3
,
w3
,
w4
bic
w3
,
w3
,
w4
str
w3
,
[
x0
,
#
UARTCR
]
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
*/
/
*
Program
the
baudrate
*/
/
*
Divisor
=
(
Uart
clock
*
4
)
/
baudrate
*/
/
*
Divisor
=
(
Uart
clock
*
4
)
/
baudrate
*/
lsl
w1
,
w1
,
#
2
lsl
w1
,
w1
,
#
2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment