andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib: el3_runtime: Fix SPE system registers in el2_sysregs_context 

Include EL2 registers related to SPE in EL2 context save/restore
routines if architecture supports it and platform wants to use these
features in Secure world.

Change-Id: Ie01a2c38fa5f6c907276eddec120fdfb222561a6
Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
This commit is contained in:
Arunachalam Ganapathy 2020-10-09 14:51:41 +01:00 committed by Manish Pandey
parent 062f8aaf8a
commit 2b036b7995
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/el3_runtime/aarch64/context.S
View File

@ -94,8 +94,12 @@ func el2_sysregs_context_save
stp x13, x14, [x0, #CTX_ICH_VMCR_EL2]
mrs x15, mdcr_el2
#if ENABLE_SPE_FOR_LOWER_ELS
mrs x16, PMSCR_EL2
stp x15, x16, [x0, #CTX_MDCR_EL2]
#else
str x15, [x0, #CTX_MDCR_EL2]
#endif
mrs x17, sctlr_el2
mrs x9, spsr_el2
@ -291,9 +295,13 @@ func el2_sysregs_context_restore
msr ICH_VMCR_EL2, x13
msr mair_el2, x14
#if ENABLE_SPE_FOR_LOWER_ELS
ldp x15, x16, [x0, #CTX_MDCR_EL2]
msr mdcr_el2, x15
msr PMSCR_EL2, x16
#else
ldr x15, [x0, #CTX_MDCR_EL2]
#endif
msr mdcr_el2, x15
ldp x17, x9, [x0, #CTX_SCTLR_EL2]
msr sctlr_el2, x17