From e83cccfec4a869b34a8968feac099a51775c103e Mon Sep 17 00:00:00 2001 From: Sona Mathew Date: Mon, 17 Mar 2025 11:57:09 -0500 Subject: [PATCH] chore(cpus): rearrange cve in order in Cortex-X1 Patch rearranges CVE-2024-5660 in ascending order based on the year and index for Cortex X1. Change-Id: I0c4206e38f09b1f88ee95e8ce69d7e13b8a9bb2d Signed-off-by: Sona Mathew --- lib/cpus/aarch64/cortex_x1.S | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/cpus/aarch64/cortex_x1.S b/lib/cpus/aarch64/cortex_x1.S index 27d181a02..cb759cc4c 100644 --- a/lib/cpus/aarch64/cortex_x1.S +++ b/lib/cpus/aarch64/cortex_x1.S @@ -25,13 +25,6 @@ cpu_reset_prologue cortex_x1 -/* Disable hardware page aggregation. Enables mitigation for `CVE-2024-5660` */ -workaround_reset_start cortex_x1, CVE(2024, 5660), WORKAROUND_CVE_2024_5660 - sysreg_bit_set CORTEX_X1_CPUECTLR_EL1, BIT(46) -workaround_reset_end cortex_x1, CVE(2024, 5660) - -check_erratum_ls cortex_x1, CVE(2024, 5660), CPU_REV(1, 2) - workaround_reset_start cortex_x1, ERRATUM(1688305), ERRATA_X1_1688305 sysreg_bit_set CORTEX_X1_ACTLR2_EL1, BIT(1) workaround_reset_end cortex_x1, ERRATUM(1688305) @@ -62,6 +55,13 @@ workaround_reset_start cortex_x1, CVE(2022, 23960), WORKAROUND_CVE_2022_23960 #endif /* IMAGE_BL31 */ workaround_reset_end cortex_x1, CVE(2022, 23960) +/* Disable hardware page aggregation. Enables mitigation for `CVE-2024-5660` */ +workaround_reset_start cortex_x1, CVE(2024, 5660), WORKAROUND_CVE_2024_5660 + sysreg_bit_set CORTEX_X1_CPUECTLR_EL1, BIT(46) +workaround_reset_end cortex_x1, CVE(2024, 5660) + +check_erratum_ls cortex_x1, CVE(2024, 5660), CPU_REV(1, 2) + cpu_reset_func_start cortex_x1 cpu_reset_func_end cortex_x1