mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-16 17:44:19 +00:00
a62b1b31d8
This involves replacing:
* the reset_func with the standard cpu_reset_func_{start,end} to apply
errata automatically
* the <cpu>_errata_report with the errata_report_shim to report errata
automatically
...and for each erratum:
* the prologue with the workaround_<type>_start to do the checks and
framework registration automatically
* the epilogue with the workaround_<type>_end
* the checker function with the check_erratum_<type> to make it more
descriptive
It is important to note that the errata workaround sequences remain
unchanged and preserve their git blame.
Testing was conducted by:
* Building for release with all errata flags enabled and running script
in change 19136 to compare output of objdump for each errata.
* Testing via script was not complete, as it directed to verify the
check and the workaround functions of few erratas manually.
* Manual comparison of disassembly of converted functions with non-
converted functions
aarch64-none-elf-objdump -D <trusted-firmware-a with conversion>/build/../release/bl31/bl31.elf
vs
aarch64-none-elf-objdump -D <trusted-firmware-a clean repo>/build/fvp/release/bl31/bl31.elf
* Manual comparison of disassembly of both both files(bl31.elf)
ensured,the ported changes were identical and hence verified.
* Build for release with all errata flags enabled and run default tftf
tests.
CROSS_COMPILE=aarch64-none-elf- \
make PLAT=fvp \
ARCH=aarch64 \
DEBUG=0 \
HW_ASSISTED_COHERENCY=1 \
USE_COHERENT_MEM=0 \
CTX_INCLUDE_AARCH32_REGS=0 \
ERRATA_X2_2002765=1 \
ERRATA_X2_2017096=1 \
ERRATA_X2_2058056=1 \
ERRATA_X2_2081180=1 \
ERRATA_X2_2083908=1 \
ERRATA_X2_2147715=1 \
ERRATA_X2_2216384=1 \
ERRATA_X2_2282622=1 \
ERRATA_X2_2371105=1 \
ERRATA_X2_2768515=1 \
WORKAROUND_CVE_2022_23960=1 \
ERRATA_DSU_2313941=1 \
BL33=/home/jaychi01/tf_a/tf-a-tests/build/fvp/release/tftf.bin \
fip all -j12
* Build for debug with all errata enabled and step through ArmDS
at reset to ensure that if Errata are applicable then the workaround
functions are entered precisely.
Change-Id: Icd2268cdf27f41240c92e3df23b5ad22f3ce3124
Signed-off-by: Jayanth Dodderi Chidanand <jayanthdodderi.chidanand@arm.com>
215 lines
6.9 KiB
ArmAsm
215 lines
6.9 KiB
ArmAsm
/*
|
|
* Copyright (c) 2021-2023, 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_x2.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 X2 must be compiled with HW_ASSISTED_COHERENCY enabled"
|
|
#endif
|
|
|
|
/* 64-bit only core */
|
|
#if CTX_INCLUDE_AARCH32_REGS == 1
|
|
#error "Cortex X2 supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0"
|
|
#endif
|
|
|
|
#if WORKAROUND_CVE_2022_23960
|
|
wa_cve_2022_23960_bhb_vector_table CORTEX_X2_BHB_LOOP_COUNT, cortex_x2
|
|
#endif /* WORKAROUND_CVE_2022_23960 */
|
|
|
|
workaround_reset_start cortex_x2, ERRATUM(2002765), ERRATA_X2_2002765
|
|
ldr x0, =0x6
|
|
msr S3_6_C15_C8_0, x0 /* CPUPSELR_EL3 */
|
|
ldr x0, =0xF3A08002
|
|
msr S3_6_C15_C8_2, x0 /* CPUPOR_EL3 */
|
|
ldr x0, =0xFFF0F7FE
|
|
msr S3_6_C15_C8_3, x0 /* CPUPMR_EL3 */
|
|
ldr x0, =0x40000001003ff
|
|
msr S3_6_C15_C8_1, x0 /* CPUPCR_EL3 */
|
|
workaround_reset_end cortex_x2, ERRATUM(2002765)
|
|
|
|
check_erratum_ls cortex_x2, ERRATUM(2002765), CPU_REV(2, 0)
|
|
|
|
workaround_reset_start cortex_x2, ERRATUM(2017096), ERRATA_X2_2017096
|
|
mrs x1, CORTEX_X2_CPUECTLR_EL1
|
|
orr x1, x1, CORTEX_X2_CPUECTLR_EL1_PFSTIDIS_BIT
|
|
msr CORTEX_X2_CPUECTLR_EL1, x1
|
|
workaround_reset_end cortex_x2, ERRATUM(2017096)
|
|
|
|
check_erratum_ls cortex_x2, ERRATUM(2017096), CPU_REV(2, 0)
|
|
|
|
workaround_reset_start cortex_x2, ERRATUM(2058056), ERRATA_X2_2058056
|
|
mrs x1, CORTEX_X2_CPUECTLR2_EL1
|
|
mov x0, #CORTEX_X2_CPUECTLR2_EL1_PF_MODE_CNSRV
|
|
bfi x1, x0, #CORTEX_X2_CPUECTLR2_EL1_PF_MODE_SHIFT, #CORTEX_X2_CPUECTLR2_EL1_PF_MODE_WIDTH
|
|
msr CORTEX_X2_CPUECTLR2_EL1, x1
|
|
workaround_reset_end cortex_x2, ERRATUM(2058056)
|
|
|
|
check_erratum_ls cortex_x2, ERRATUM(2058056), CPU_REV(2, 0)
|
|
|
|
workaround_reset_start cortex_x2, ERRATUM(2081180), ERRATA_X2_2081180
|
|
/* Apply instruction patching sequence */
|
|
ldr x0, =0x3
|
|
msr CORTEX_X2_IMP_CPUPSELR_EL3, x0
|
|
ldr x0, =0xF3A08002
|
|
msr CORTEX_X2_IMP_CPUPOR_EL3, x0
|
|
ldr x0, =0xFFF0F7FE
|
|
msr CORTEX_X2_IMP_CPUPMR_EL3, x0
|
|
ldr x0, =0x10002001003FF
|
|
msr CORTEX_X2_IMP_CPUPCR_EL3, x0
|
|
ldr x0, =0x4
|
|
msr CORTEX_X2_IMP_CPUPSELR_EL3, x0
|
|
ldr x0, =0xBF200000
|
|
msr CORTEX_X2_IMP_CPUPOR_EL3, x0
|
|
ldr x0, =0xFFEF0000
|
|
msr CORTEX_X2_IMP_CPUPMR_EL3, x0
|
|
ldr x0, =0x10002001003F3
|
|
msr CORTEX_X2_IMP_CPUPCR_EL3, x0
|
|
workaround_reset_end cortex_x2, ERRATUM(2081180)
|
|
|
|
check_erratum_ls cortex_x2, ERRATUM(2081180), CPU_REV(2, 0)
|
|
|
|
workaround_reset_start cortex_x2, ERRATUM(2083908), ERRATA_X2_2083908
|
|
/* Apply the workaround by setting bit 13 in CPUACTLR5_EL1. */
|
|
mrs x1, CORTEX_X2_CPUACTLR5_EL1
|
|
orr x1, x1, #BIT(13)
|
|
msr CORTEX_X2_CPUACTLR5_EL1, x1
|
|
workaround_reset_end cortex_x2, ERRATUM(2083908)
|
|
|
|
check_erratum_range cortex_x2, ERRATUM(2083908), CPU_REV(2, 0), CPU_REV(2, 0)
|
|
|
|
workaround_reset_start cortex_x2, ERRATUM(2147715), ERRATA_X2_2147715
|
|
/* Apply the workaround by setting bit 22 in CPUACTLR_EL1. */
|
|
mrs x1, CORTEX_X2_CPUACTLR_EL1
|
|
orr x1, x1, CORTEX_X2_CPUACTLR_EL1_BIT_22
|
|
msr CORTEX_X2_CPUACTLR_EL1, x1
|
|
workaround_reset_end cortex_x2, ERRATUM(2147715)
|
|
|
|
check_erratum_range cortex_x2, ERRATUM(2147715), CPU_REV(2, 0), CPU_REV(2, 0)
|
|
|
|
workaround_reset_start cortex_x2, ERRATUM(2216384), ERRATA_X2_2216384
|
|
mrs x1, CORTEX_X2_CPUACTLR5_EL1
|
|
orr x1, x1, CORTEX_X2_CPUACTLR5_EL1_BIT_17
|
|
msr CORTEX_X2_CPUACTLR5_EL1, x1
|
|
|
|
/* Apply instruction patching sequence */
|
|
ldr x0, =0x5
|
|
msr CORTEX_X2_IMP_CPUPSELR_EL3, x0
|
|
ldr x0, =0x10F600E000
|
|
msr CORTEX_X2_IMP_CPUPOR_EL3, x0
|
|
ldr x0, =0x10FF80E000
|
|
msr CORTEX_X2_IMP_CPUPMR_EL3, x0
|
|
ldr x0, =0x80000000003FF
|
|
msr CORTEX_X2_IMP_CPUPCR_EL3, x0
|
|
workaround_reset_end cortex_x2, ERRATUM(2216384)
|
|
|
|
check_erratum_ls cortex_x2, ERRATUM(2216384), CPU_REV(2, 0)
|
|
|
|
workaround_reset_start cortex_x2, ERRATUM(2282622), ERRATA_X2_2282622
|
|
/* Apply the workaround */
|
|
mrs x1, CORTEX_X2_CPUACTLR2_EL1
|
|
orr x1, x1, #BIT(0)
|
|
msr CORTEX_X2_CPUACTLR2_EL1, x1
|
|
workaround_reset_end cortex_x2, ERRATUM(2282622)
|
|
|
|
check_erratum_ls cortex_x2, ERRATUM(2282622), CPU_REV(2, 1)
|
|
|
|
workaround_reset_start cortex_x2, ERRATUM(2371105), ERRATA_X2_2371105
|
|
/* Set bit 40 in CPUACTLR2_EL1 */
|
|
mrs x1, CORTEX_X2_CPUACTLR2_EL1
|
|
orr x1, x1, #CORTEX_X2_CPUACTLR2_EL1_BIT_40
|
|
msr CORTEX_X2_CPUACTLR2_EL1, x1
|
|
workaround_reset_end cortex_x2, ERRATUM(2371105)
|
|
|
|
check_erratum_ls cortex_x2, ERRATUM(2371105), CPU_REV(2, 0)
|
|
|
|
workaround_reset_start cortex_x2, ERRATUM(2768515), ERRATA_X2_2768515
|
|
/* dsb before isb of power down sequence */
|
|
dsb sy
|
|
workaround_reset_end cortex_x2, ERRATUM(2768515)
|
|
|
|
check_erratum_ls cortex_x2, ERRATUM(2768515), CPU_REV(2, 1)
|
|
|
|
workaround_reset_start cortex_x2, CVE(2022, 23960), WORKAROUND_CVE_2022_23960
|
|
#if IMAGE_BL31
|
|
/*
|
|
* The Cortex-X2 generic vectors are overridden to apply errata
|
|
* mitigation on exception entry from lower ELs.
|
|
*/
|
|
adr x0, wa_cve_vbar_cortex_x2
|
|
msr vbar_el3, x0
|
|
#endif /* IMAGE_BL31 */
|
|
workaround_reset_end cortex_x2, CVE(2022, 23960)
|
|
|
|
check_erratum_chosen cortex_x2, CVE(2022, 23960), WORKAROUND_CVE_2022_23960
|
|
|
|
/*
|
|
* ERRATA_DSU_2313941 :
|
|
* The errata is defined in dsu_helpers.S but applies to cortex_x2
|
|
* as well. Henceforth creating symbolic names to the already existing errata
|
|
* workaround functions to get them registered under the Errata Framework.
|
|
*/
|
|
.equ check_erratum_cortex_x2_2313941, check_errata_dsu_2313941
|
|
.equ erratum_cortex_x2_2313941_wa, errata_dsu_2313941_wa
|
|
add_erratum_entry cortex_x2, ERRATUM(2313941), ERRATA_DSU_2313941, APPLY_AT_RESET
|
|
|
|
/* ----------------------------------------------------
|
|
* HW will do the cache maintenance while powering down
|
|
* ----------------------------------------------------
|
|
*/
|
|
func cortex_x2_core_pwr_dwn
|
|
/* ---------------------------------------------------
|
|
* Enable CPU power down bit in power control register
|
|
* ---------------------------------------------------
|
|
*/
|
|
mrs x0, CORTEX_X2_CPUPWRCTLR_EL1
|
|
orr x0, x0, #CORTEX_X2_CPUPWRCTLR_EL1_CORE_PWRDN_BIT
|
|
msr CORTEX_X2_CPUPWRCTLR_EL1, x0
|
|
#if ERRATA_X2_2768515
|
|
mov x15, x30
|
|
bl cpu_get_rev_var
|
|
bl erratum_cortex_x2_2768515_wa
|
|
mov x30, x15
|
|
#endif /* ERRATA_X2_2768515 */
|
|
isb
|
|
ret
|
|
endfunc cortex_x2_core_pwr_dwn
|
|
|
|
errata_report_shim cortex_x2
|
|
|
|
cpu_reset_func_start cortex_x2
|
|
/* Disable speculative loads */
|
|
msr SSBS, xzr
|
|
cpu_reset_func_end cortex_x2
|
|
|
|
/* ---------------------------------------------
|
|
* This function provides Cortex X2 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_x2_regs, "aS"
|
|
cortex_x2_regs: /* The ascii list of register names to be reported */
|
|
.asciz "cpuectlr_el1", ""
|
|
|
|
func cortex_x2_cpu_reg_dump
|
|
adr x6, cortex_x2_regs
|
|
mrs x8, CORTEX_X2_CPUECTLR_EL1
|
|
ret
|
|
endfunc cortex_x2_cpu_reg_dump
|
|
|
|
declare_cpu_ops cortex_x2, CORTEX_X2_MIDR, \
|
|
cortex_x2_reset_func, \
|
|
cortex_x2_core_pwr_dwn
|