Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-24 05:54:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(cpus): revert erroneous use of override_vector_table macro in Cortex-A73" into integration

Browse source
This commit is contained in:
Bipin Ravi 2023-08-08 22:33:45 +02:00 • committed by TrustedFirmware Code Review
commit 1fd03dd62b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/cpus/aarch64/cortex_a73.S
View file

@ -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 workaround_reset_start cortex_a73, CVE(2022, 23960), WORKAROUND_CVE_2022_23960
#if IMAGE_BL31 #if IMAGE_BL31
/* Skip installing vector table again for CVE_2022_23960 */ /* 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 cmp x0, x1
b.eq 1f b.eq 1f
msr vbar_el3, x0 msr vbar_el3, x0