From 2e09d4f804f9a4005c6e297e7d775829344e5b22 Mon Sep 17 00:00:00 2001 From: Ken Kuang Date: Wed, 23 Aug 2017 16:03:29 +0800 Subject: [PATCH] fix a typo about sctlr_el2 which will cause write_sctlr_el2 use all sctlr_el1 value except the EE bit The code doesn't "Use SCTLR_EL1.EE value to initialise sctlr_el2" but, read out SCTLR_EL1 and clear EE bit, then set to sctlr_el2 Signed-off-by: Ken Kuang --- lib/el3_runtime/aarch64/context_mgmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c index 5257bf1c5..3d26056a3 100644 --- a/lib/el3_runtime/aarch64/context_mgmt.c +++ b/lib/el3_runtime/aarch64/context_mgmt.c @@ -229,7 +229,7 @@ void cm_prepare_el3_exit(uint32_t security_state) /* Use SCTLR_EL1.EE value to initialise sctlr_el2 */ sctlr_elx = read_ctx_reg(get_sysregs_ctx(ctx), CTX_SCTLR_EL1); - sctlr_elx &= ~SCTLR_EE_BIT; + sctlr_elx &= SCTLR_EE_BIT; sctlr_elx |= SCTLR_EL2_RES1; write_sctlr_el2(sctlr_elx); } else if (EL_IMPLEMENTED(2)) {