diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cpus/aarch64/cortex_a57.S | 1 | ||||
| -rw-r--r-- | lib/cpus/aarch64/cortex_a72.S | 1 | ||||
| -rw-r--r-- | lib/cpus/aarch64/cortex_a73.S | 1 | ||||
| -rw-r--r-- | lib/cpus/aarch64/cortex_a75.S | 1 | ||||
| -rw-r--r-- | lib/xlat_tables_v2/xlat_tables_internal.c | 4 |
5 files changed, 6 insertions, 2 deletions
diff --git a/lib/cpus/aarch64/cortex_a57.S b/lib/cpus/aarch64/cortex_a57.S index 07fadd15..8e604455 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 bb9381d1..38b76b94 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 d595f128..b7965613 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 20ec32ce..73f566f4 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 diff --git a/lib/xlat_tables_v2/xlat_tables_internal.c b/lib/xlat_tables_v2/xlat_tables_internal.c index 31d3365b..a38f97f2 100644 --- a/lib/xlat_tables_v2/xlat_tables_internal.c +++ b/lib/xlat_tables_v2/xlat_tables_internal.c @@ -784,8 +784,8 @@ void mmap_add_region_ctx(xlat_ctx_t *ctx, const mmap_region_t *mm) && mm_cursor->size) ++mm_cursor; - while ((mm_cursor->base_va + mm_cursor->size - 1 == end_va) - && (mm_cursor->size < mm->size)) + while ((mm_cursor->base_va + mm_cursor->size - 1 == end_va) && + (mm_cursor->size != 0U) && (mm_cursor->size < mm->size)) ++mm_cursor; /* |