From 9a0c81257ff116b2ca33f5b6737e0a000fb7e551 Mon Sep 17 00:00:00 2001 From: Sona Mathew Date: Mon, 7 Aug 2023 18:16:27 -0500 Subject: [PATCH] fix(cpus): revert erroneous use of override_vector_table macro in Cortex-A73 override_vector_table does adr, followed by an msr ops. Accidentally was used here for for adr and mrs op. Signed-off-by: Sona Mathew Change-Id: I2d3fda12acd097acabbde9b7dcc376d08419e223 --- lib/cpus/aarch64/cortex_a73.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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