diff options
| author | Bipin Ravi <bipin.ravi@arm.com> | 2023-08-08 22:33:45 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-08-08 22:33:45 +0200 |
| commit | 1fd03dd62b4c107ad5f00ed46929b385fcf987c7 (patch) | |
| tree | aab580a99648a9d3b0630f16eff4fa71a1cedefb /lib/cpus/aarch64 | |
| parent | a3919ed0ab19182c801294902acebeb19d11d7b5 (diff) | |
| parent | 9a0c81257ff116b2ca33f5b6737e0a000fb7e551 (diff) | |
Merge "fix(cpus): revert erroneous use of override_vector_table macro in Cortex-A73" into integration
Diffstat (limited to 'lib/cpus/aarch64')
| -rw-r--r-- | lib/cpus/aarch64/cortex_a73.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/cpus/aarch64/cortex_a73.S b/lib/cpus/aarch64/cortex_a73.S index a7435c70f..3a6b92263 100644 --- a/lib/cpus/aarch64/cortex_a73.S +++ b/lib/cpus/aarch64/cortex_a73.S @@ -76,7 +76,9 @@ check_erratum_chosen cortex_a73, CVE(2018, 3639), WORKAROUND_CVE_2018_3639 workaround_reset_start cortex_a73, CVE(2022, 23960), WORKAROUND_CVE_2022_23960 #if IMAGE_BL31 /* Skip installing vector table again for CVE_2022_23960 */ - override_vector_table wa_cve_2017_5715_bpiall_vbar + adr x0, wa_cve_2017_5715_bpiall_vbar + mrs x1, vbar_el3 + cmp x0, x1 b.eq 1f msr vbar_el3, x0 |