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

Merge "feat(spmd): initialize SCR_EL3.EEL2 bit at RESET" into integration

Browse source
This commit is contained in:
Manish Pandey 2024-02-03 11:29:39 +01:00 • committed by TrustedFirmware Code Review
commit b55bf2562e
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/arch/aarch64/el3_common_macros.S
View file

@ -64,9 +64,21 @@
* *
* SCR_EL3.EA: Set to one to route External Aborts and SError Interrupts * SCR_EL3.EA: Set to one to route External Aborts and SError Interrupts
* to EL3 when executing at any EL. * to EL3 when executing at any EL.
*
* SCR_EL3.EEL2: Set to one if S-EL2 is present and enabled.
*
* NOTE: Modifying EEL2 bit along with EA bit ensures that we mitigate
* against ERRATA_V2_3099206.
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
*/ */
mov_imm x0, (SCR_RESET_VAL | SCR_EA_BIT | SCR_SIF_BIT) mov_imm x0, (SCR_RESET_VAL | SCR_EA_BIT | SCR_SIF_BIT)
#if IMAGE_BL31 && defined(SPD_spmd) && SPMD_SPM_AT_SEL2
mrs x1, id_aa64pfr0_el1
and x1, x1, #(ID_AA64PFR0_SEL2_MASK << ID_AA64PFR0_SEL2_SHIFT)
cbz x1, 1f
orr x0, x0, #SCR_EEL2_BIT
#endif
1:
msr scr_el3, x0 msr scr_el3, x0
/* --------------------------------------------------------------------- /* ---------------------------------------------------------------------