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

Merge "SPM: Change condition on saving/restoring EL2 registers" into integration

This commit is contained in:
Manish Pandey 2020-08-19 15:34:50 +00:00 committed by TrustedFirmware Code Review
parent 572dea8534 6b704da34b
commit e268ea271a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/el3_runtime/aarch64/context_mgmt.c
View File

@ -585,7 +585,7 @@ void cm_el2_sysregs_context_save(uint32_t security_state)
* S-EL2 context if S-EL2 is enabled.
*/
if ((security_state == NON_SECURE) ||
((scr_el3 & SCR_EEL2_BIT) != 0U)) {
((security_state == SECURE) && ((scr_el3 & SCR_EEL2_BIT) != 0U))) {
cpu_context_t *ctx;
ctx = cm_get_context(security_state);
@ -607,7 +607,7 @@ void cm_el2_sysregs_context_restore(uint32_t security_state)
* S-EL2 context if S-EL2 is enabled.
*/
if ((security_state == NON_SECURE) ||
((scr_el3 & SCR_EEL2_BIT) != 0U)) {
((security_state == SECURE) && ((scr_el3 & SCR_EEL2_BIT) != 0U))) {
cpu_context_t *ctx;
ctx = cm_get_context(security_state);