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
b8dc3f14
Unverified
Commit
b8dc3f14
authored
Jun 19, 2018
by
Dimitris Papastamos
Committed by
GitHub
Jun 19, 2018
Browse files
Merge pull request #1430 from dp-arm/dp/cpulib
cpulib: Add ISBs or comment why they are unneeded
parents
7fb3a70b
bd5a76ac
Changes
4
Hide whitespace changes
Inline
Side-by-side
lib/cpus/aarch64/cortex_a57.S
View file @
b8dc3f14
...
@@ -404,6 +404,7 @@ func cortex_a57_reset_func
...
@@ -404,6 +404,7 @@ func cortex_a57_reset_func
#if IMAGE_BL31 && WORKAROUND_CVE_2017_5715
#if IMAGE_BL31 && WORKAROUND_CVE_2017_5715
adr
x0
,
wa_cve_2017_5715_mmu_vbar
adr
x0
,
wa_cve_2017_5715_mmu_vbar
msr
vbar_el3
,
x0
msr
vbar_el3
,
x0
/
*
isb
will
be
performed
before
returning
from
this
function
*/
#endif
#endif
#if WORKAROUND_CVE_2018_3639
#if WORKAROUND_CVE_2018_3639
...
...
lib/cpus/aarch64/cortex_a72.S
View file @
b8dc3f14
...
@@ -137,6 +137,7 @@ func cortex_a72_reset_func
...
@@ -137,6 +137,7 @@ func cortex_a72_reset_func
cpu_check_csv2
x0
,
1
f
cpu_check_csv2
x0
,
1
f
adr
x0
,
wa_cve_2017_5715_mmu_vbar
adr
x0
,
wa_cve_2017_5715_mmu_vbar
msr
vbar_el3
,
x0
msr
vbar_el3
,
x0
/
*
isb
will
be
performed
before
returning
from
this
function
*/
1
:
1
:
#endif
#endif
...
...
lib/cpus/aarch64/cortex_a73.S
View file @
b8dc3f14
...
@@ -40,6 +40,7 @@ func cortex_a73_reset_func
...
@@ -40,6 +40,7 @@ func cortex_a73_reset_func
cpu_check_csv2
x0
,
1
f
cpu_check_csv2
x0
,
1
f
adr
x0
,
wa_cve_2017_5715_bpiall_vbar
adr
x0
,
wa_cve_2017_5715_bpiall_vbar
msr
vbar_el3
,
x0
msr
vbar_el3
,
x0
/
*
isb
will
be
performed
before
returning
from
this
function
*/
1
:
1
:
#endif
#endif
...
...
lib/cpus/aarch64/cortex_a75.S
View file @
b8dc3f14
...
@@ -15,6 +15,7 @@ func cortex_a75_reset_func
...
@@ -15,6 +15,7 @@ func cortex_a75_reset_func
cpu_check_csv2
x0
,
1
f
cpu_check_csv2
x0
,
1
f
adr
x0
,
wa_cve_2017_5715_bpiall_vbar
adr
x0
,
wa_cve_2017_5715_bpiall_vbar
msr
vbar_el3
,
x0
msr
vbar_el3
,
x0
isb
1
:
1
:
#endif
#endif
...
...
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