aboutsummaryrefslogtreecommitdiff
path: root/lib/cpus
diff options
context:
space:
mode:
authorDimitris Papastamos <dimitris.papastamos@arm.com>2018-06-07 13:20:19 +0100
committerDimitris Papastamos <dimitris.papastamos@arm.com>2018-06-19 10:34:51 +0100
commitbd5a76ac7c21515ceb2b85a46de471416d2c83fa (patch)
tree1e663f63dfe3fcf25854993cec7b7474e57c520d /lib/cpus
parentac0197d9d57777f445cbd7f19b0294c461ff7082 (diff)
downloadarm-trusted-firmware-bd5a76ac7c21515ceb2b85a46de471416d2c83fa.tar.gz
cpulib: Add ISBs or comment why they are unneeded
Change-Id: I18a41bb9fedda635c3c002a7f112578808410ef6 Signed-off-by: Dimitris Papastamos <dimitris.papastamos@arm.com>
Diffstat (limited to 'lib/cpus')
-rw-r--r--lib/cpus/aarch64/cortex_a57.S1
-rw-r--r--lib/cpus/aarch64/cortex_a72.S1
-rw-r--r--lib/cpus/aarch64/cortex_a73.S1
-rw-r--r--lib/cpus/aarch64/cortex_a75.S1
4 files changed, 4 insertions, 0 deletions
diff --git a/lib/cpus/aarch64/cortex_a57.S b/lib/cpus/aarch64/cortex_a57.S
index 07fadd154..8e6044551 100644
--- a/lib/cpus/aarch64/cortex_a57.S
+++ b/lib/cpus/aarch64/cortex_a57.S
@@ -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
diff --git a/lib/cpus/aarch64/cortex_a72.S b/lib/cpus/aarch64/cortex_a72.S
index bb9381d17..38b76b940 100644
--- a/lib/cpus/aarch64/cortex_a72.S
+++ b/lib/cpus/aarch64/cortex_a72.S
@@ -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
diff --git a/lib/cpus/aarch64/cortex_a73.S b/lib/cpus/aarch64/cortex_a73.S
index d595f128f..b79656135 100644
--- a/lib/cpus/aarch64/cortex_a73.S
+++ b/lib/cpus/aarch64/cortex_a73.S
@@ -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
diff --git a/lib/cpus/aarch64/cortex_a75.S b/lib/cpus/aarch64/cortex_a75.S
index 20ec32ce2..73f566f4b 100644
--- a/lib/cpus/aarch64/cortex_a75.S
+++ b/lib/cpus/aarch64/cortex_a75.S
@@ -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