diff --git a/lib/cpus/aarch64/cortex_a78c.S b/lib/cpus/aarch64/cortex_a78c.S index 260cc73a1..3f6944a7a 100644 --- a/lib/cpus/aarch64/cortex_a78c.S +++ b/lib/cpus/aarch64/cortex_a78c.S @@ -21,6 +21,13 @@ wa_cve_2022_23960_bhb_vector_table CORTEX_A78C_BHB_LOOP_COUNT, cortex_a78c #endif /* WORKAROUND_CVE_2022_23960 */ +/* Disable hardware page aggregation. Enables mitigation for `CVE-2024-5660` */ +workaround_reset_start cortex_a78c, CVE(2024, 5660), WORKAROUND_CVE_2024_5660 + sysreg_bit_set CORTEX_A78C_CPUECTLR_EL1, BIT(46) +workaround_reset_end cortex_a78c, CVE(2024, 5660) + +check_erratum_ls cortex_a78c, CVE(2024, 5660), CPU_REV(0, 2) + workaround_reset_start cortex_a78c, ERRATUM(1827430), ERRATA_A78C_1827430 /* Disable allocation of splintered pages in the L2 TLB */ sysreg_bit_set CORTEX_A78C_CPUECTLR_EL1, CORTEX_A78C_CPUECTLR_EL1_MM_ASP_EN