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

chore(cpus): fix cve order in Neoverse-V1

Browse source 
This patch rearranges CVE-2024-5660 apply order in Neoverse-V1.

Signed-off-by: Arvind Ram Prakash <arvind.ramprakash@arm.com>
Change-Id: Ice0b1c6efa913f88522fb33182b9cdc0e7723988
This commit is contained in:
Arvind Ram Prakash 2025-03-19 15:36:27 -05:00
parent eb9220b2d1
commit 5c43b966fd
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/cpus/aarch64/neoverse_v1.S
View file

@ -28,13 +28,6 @@ cpu_reset_prologue neoverse_v1
wa_cve_2022_23960_bhb_vector_table NEOVERSE_V1_BHB_LOOP_COUNT, neoverse_v1
#endif /* WORKAROUND_CVE_2022_23960 */
/* Disable hardware page aggregation. Enables mitigation for `CVE-2024-5660` */
workaround_reset_start neoverse_v1, CVE(2024, 5660), WORKAROUND_CVE_2024_5660
sysreg_bit_set NEOVERSE_V1_CPUECTLR_EL1, BIT(46)
workaround_reset_end neoverse_v1, CVE(2024, 5660)
check_erratum_ls neoverse_v1, CVE(2024, 5660), CPU_REV(1, 2)
workaround_reset_start neoverse_v1, ERRATUM(1618635), ERRATA_V1_1618635
/* Inserts a DMB SY before and after MRS PAR_EL1 */
ldr x0, =0x0
@ -252,6 +245,13 @@ workaround_reset_end neoverse_v1, CVE(2022,23960)
check_erratum_chosen neoverse_v1, CVE(2022, 23960), WORKAROUND_CVE_2022_23960
/* Disable hardware page aggregation. Enables mitigation for `CVE-2024-5660` */
workaround_reset_start neoverse_v1, CVE(2024, 5660), WORKAROUND_CVE_2024_5660
sysreg_bit_set NEOVERSE_V1_CPUECTLR_EL1, BIT(46)
workaround_reset_end neoverse_v1, CVE(2024, 5660)
check_erratum_ls neoverse_v1, CVE(2024, 5660), CPU_REV(1, 2)
/* ---------------------------------------------
* HW will do the cache maintenance while powering down
* ---------------------------------------------