mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-08 05:43:53 +00:00
89dba82dfa
Errata application is painful for performance. For a start, it's done when the core has just come out of reset, which means branch predictors and caches will be empty so a branch to a workaround function must be fetched from memory and that round trip is very slow. Then it also runs with the I-cache off, which means that the loop to iterate over the workarounds must also be fetched from memory on each iteration. We can remove both branches. First, we can simply apply every erratum directly instead of defining a workaround function and jumping to it. Currently, no errata that need to be applied at both reset and runtime, with the same workaround function, exist. If the need arose in future, this should be achievable with a reset + runtime wrapper combo. Then, we can construct a function that applies each erratum linearly instead of looping over the list. If this function is part of the reset function, then the only "far" branches at reset will be for the checker functions. Importantly, this mitigates the slowdown even when an erratum is disabled. The result is ~50% speedup on N1SDP and ~20% on AArch64 Juno on wakeup from PSCI calls that end in powerdown. This is roughly back to the baseline of v2.9, before the errata framework regressed on performance (or a little better). It is important to note that there are other slowdowns since then that remain unknown. Change-Id: Ie4d5288a331b11fd648e5c4a0b652b74160b07b9 Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
180 lines
5.6 KiB
ArmAsm
180 lines
5.6 KiB
ArmAsm
/*
|
|
* Copyright (c) 2021-2025, Arm Limited. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include <arch.h>
|
|
#include <asm_macros.S>
|
|
#include <common/bl_common.h>
|
|
#include <cortex_a715.h>
|
|
#include <cpu_macros.S>
|
|
#include <plat_macros.S>
|
|
#include "wa_cve_2022_23960_bhb_vector.S"
|
|
|
|
/* Hardware handled coherency */
|
|
#if HW_ASSISTED_COHERENCY == 0
|
|
#error "Cortex-A715 must be compiled with HW_ASSISTED_COHERENCY enabled"
|
|
#endif
|
|
|
|
/* 64-bit only core */
|
|
#if CTX_INCLUDE_AARCH32_REGS == 1
|
|
#error "Cortex-A715 supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0"
|
|
#endif
|
|
|
|
.global check_erratum_cortex_a715_3699560
|
|
|
|
#if WORKAROUND_CVE_2022_23960
|
|
wa_cve_2022_23960_bhb_vector_table CORTEX_A715_BHB_LOOP_COUNT, cortex_a715
|
|
#endif /* WORKAROUND_CVE_2022_23960 */
|
|
|
|
cpu_reset_prologue cortex_a715
|
|
|
|
workaround_reset_start cortex_a715, ERRATUM(2331818), ERRATA_A715_2331818
|
|
sysreg_bit_set CORTEX_A715_CPUACTLR2_EL1, BIT(20)
|
|
workaround_reset_end cortex_a715, ERRATUM(2331818)
|
|
|
|
check_erratum_ls cortex_a715, ERRATUM(2331818), CPU_REV(1, 0)
|
|
|
|
workaround_reset_start cortex_a715, ERRATUM(2344187), ERRATA_A715_2344187
|
|
/* GCR_EL1 is only present with FEAT_MTE2. */
|
|
mrs x1, ID_AA64PFR1_EL1
|
|
ubfx x0, x1, ID_AA64PFR1_EL1_MTE_SHIFT, #4
|
|
cmp x0, #MTE_IMPLEMENTED_ELX
|
|
bne #1f
|
|
sysreg_bit_set GCR_EL1, GCR_EL1_RRND_BIT
|
|
|
|
1:
|
|
/* Mitigation upon ERETAA and ERETAB. */
|
|
mov x0, #2
|
|
msr CORTEX_A715_CPUPSELR_EL3, x0
|
|
isb
|
|
ldr x0, =0xd69f0bff
|
|
msr CORTEX_A715_CPUPOR_EL3, x0
|
|
ldr x0, =0xfffffbff
|
|
msr CORTEX_A715_CPUPMR_EL3, x0
|
|
mov x1, #0
|
|
orr x1, x1, #(1<<0)
|
|
orr x1, x1, #(3<<4)
|
|
orr x1, x1, #(0xf<<6)
|
|
orr x1, x1, #(1<<13)
|
|
orr x1, x1, #(1<<53)
|
|
msr CORTEX_A715_CPUPCR_EL3, x1
|
|
workaround_reset_end cortex_a715, ERRATUM(2344187)
|
|
|
|
check_erratum_ls cortex_a715, ERRATUM(2344187), CPU_REV(1, 0)
|
|
|
|
workaround_reset_start cortex_a715, ERRATUM(2413290), ERRATA_A715_2413290
|
|
/* Erratum 2413290 workaround is required only if SPE is enabled */
|
|
#if ENABLE_SPE_FOR_NS != 0
|
|
/* Check if Static profiling extension is implemented or present. */
|
|
mrs x1, id_aa64dfr0_el1
|
|
ubfx x0, x1, ID_AA64DFR0_PMS_SHIFT, #4
|
|
cbz x0, 1f
|
|
/* Apply the workaround by setting CPUACTLR_EL1[58:57] = 0b11. */
|
|
sysreg_bit_set CORTEX_A715_CPUACTLR_EL1, BIT(57)
|
|
sysreg_bit_set CORTEX_A715_CPUACTLR_EL1, BIT(58)
|
|
1:
|
|
#endif
|
|
workaround_reset_end cortex_a715, ERRATUM(2413290)
|
|
|
|
check_erratum_range cortex_a715, ERRATUM(2413290), CPU_REV(1,0), CPU_REV(1, 0)
|
|
|
|
workaround_reset_start cortex_a715, ERRATUM(2420947), ERRATA_A715_2420947
|
|
sysreg_bit_set CORTEX_A715_CPUACTLR2_EL1, BIT(33)
|
|
workaround_reset_end cortex_a715, ERRATUM(2420947)
|
|
|
|
check_erratum_range cortex_a715, ERRATUM(2420947), CPU_REV(1, 0), CPU_REV(1, 0)
|
|
|
|
workaround_reset_start cortex_a715, ERRATUM(2429384), ERRATA_A715_2429384
|
|
sysreg_bit_set CORTEX_A715_CPUACTLR2_EL1, BIT(27)
|
|
workaround_reset_end cortex_a715, ERRATUM(2429384)
|
|
|
|
check_erratum_range cortex_a715, ERRATUM(2429384), CPU_REV(1, 0), CPU_REV(1, 0)
|
|
|
|
workaround_reset_start cortex_a715, ERRATUM(2561034), ERRATA_A715_2561034
|
|
sysreg_bit_set CORTEX_A715_CPUACTLR2_EL1, BIT(26)
|
|
workaround_reset_end cortex_a715, ERRATUM(2561034)
|
|
|
|
check_erratum_range cortex_a715, ERRATUM(2561034), CPU_REV(1, 0), CPU_REV(1, 0)
|
|
|
|
workaround_reset_start cortex_a715, ERRATUM(2728106), ERRATA_A715_2728106
|
|
mov x0, #3
|
|
msr CORTEX_A715_CPUPSELR_EL3, x0
|
|
isb
|
|
ldr x0, =0xd503339f
|
|
msr CORTEX_A715_CPUPOR_EL3, x0
|
|
ldr x0, =0xfffff3ff
|
|
msr CORTEX_A715_CPUPMR_EL3, x0
|
|
mov x0, #1
|
|
orr x0, x0, #(3<<4)
|
|
orr x0, x0, #(0xf<<6)
|
|
orr x0, x0, #(1<<13)
|
|
orr x0, x0, #(1<<20)
|
|
orr x0, x0, #(1<<22)
|
|
orr x0, x0, #(1<<31)
|
|
orr x0, x0, #(1<<50)
|
|
msr CORTEX_A715_CPUPCR_EL3, x0
|
|
workaround_reset_end cortex_a715, ERRATUM(2728106)
|
|
|
|
check_erratum_ls cortex_a715, ERRATUM(2728106), CPU_REV(1, 1)
|
|
|
|
workaround_reset_start cortex_a715, CVE(2022, 23960), WORKAROUND_CVE_2022_23960
|
|
#if IMAGE_BL31
|
|
/*
|
|
* The Cortex-A715 generic vectors are overridden to apply errata
|
|
* mitigation on exception entry from lower ELs.
|
|
*/
|
|
override_vector_table wa_cve_vbar_cortex_a715
|
|
#endif /* IMAGE_BL31 */
|
|
workaround_reset_end cortex_a715, CVE(2022, 23960)
|
|
|
|
check_erratum_chosen cortex_a715, CVE(2022, 23960), WORKAROUND_CVE_2022_23960
|
|
|
|
add_erratum_entry cortex_a715, ERRATUM(3699560), ERRATA_A715_3699560
|
|
|
|
check_erratum_ls cortex_a715, ERRATUM(3699560), CPU_REV(1, 3)
|
|
|
|
cpu_reset_func_start cortex_a715
|
|
/* Disable speculative loads */
|
|
msr SSBS, xzr
|
|
cpu_reset_func_end cortex_a715
|
|
|
|
/* ----------------------------------------------------
|
|
* HW will do the cache maintenance while powering down
|
|
* ----------------------------------------------------
|
|
*/
|
|
func cortex_a715_core_pwr_dwn
|
|
/* ---------------------------------------------------
|
|
* Enable CPU power down bit in power control register
|
|
* ---------------------------------------------------
|
|
*/
|
|
mrs x0, CORTEX_A715_CPUPWRCTLR_EL1
|
|
orr x0, x0, #CORTEX_A715_CPUPWRCTLR_EL1_CORE_PWRDN_BIT
|
|
msr CORTEX_A715_CPUPWRCTLR_EL1, x0
|
|
isb
|
|
ret
|
|
endfunc cortex_a715_core_pwr_dwn
|
|
|
|
/* ---------------------------------------------
|
|
* This function provides Cortex-A715 specific
|
|
* register information for crash reporting.
|
|
* It needs to return with x6 pointing to
|
|
* a list of register names in ascii and
|
|
* x8 - x15 having values of registers to be
|
|
* reported.
|
|
* ---------------------------------------------
|
|
*/
|
|
.section .rodata.cortex_a715_regs, "aS"
|
|
cortex_a715_regs: /* The ascii list of register names to be reported */
|
|
.asciz "cpuectlr_el1", ""
|
|
|
|
func cortex_a715_cpu_reg_dump
|
|
adr x6, cortex_a715_regs
|
|
mrs x8, CORTEX_A715_CPUECTLR_EL1
|
|
ret
|
|
endfunc cortex_a715_cpu_reg_dump
|
|
|
|
declare_cpu_ops cortex_a715, CORTEX_A715_MIDR, \
|
|
cortex_a715_reset_func, \
|
|
cortex_a715_core_pwr_dwn
|