Unverified Commit b8dc3f14 authored by Dimitris Papastamos's avatar Dimitris Papastamos Committed by GitHub
Browse files

Merge pull request #1430 from dp-arm/dp/cpulib

cpulib: Add ISBs or comment why they are unneeded
parents 7fb3a70b bd5a76ac
Showing with 4 additions and 0 deletions
+4 -0
......@@ -404,6 +404,7 @@ func cortex_a57_reset_func
#if IMAGE_BL31 && WORKAROUND_CVE_2017_5715
adr x0, wa_cve_2017_5715_mmu_vbar
msr vbar_el3, x0
/* isb will be performed before returning from this function */
#endif
#if WORKAROUND_CVE_2018_3639
......
......@@ -137,6 +137,7 @@ func cortex_a72_reset_func
cpu_check_csv2 x0, 1f
adr x0, wa_cve_2017_5715_mmu_vbar
msr vbar_el3, x0
/* isb will be performed before returning from this function */
1:
#endif
......
......@@ -40,6 +40,7 @@ func cortex_a73_reset_func
cpu_check_csv2 x0, 1f
adr x0, wa_cve_2017_5715_bpiall_vbar
msr vbar_el3, x0
/* isb will be performed before returning from this function */
1:
#endif
......
......@@ -15,6 +15,7 @@ func cortex_a75_reset_func
cpu_check_csv2 x0, 1f
adr x0, wa_cve_2017_5715_bpiall_vbar
msr vbar_el3, x0
isb
1:
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment