summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/el3_runtime/aarch32/context_mgmt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/el3_runtime/aarch32/context_mgmt.c b/lib/el3_runtime/aarch32/context_mgmt.c
index 6915ded7..bc5f9c42 100644
--- a/lib/el3_runtime/aarch32/context_mgmt.c
+++ b/lib/el3_runtime/aarch32/context_mgmt.c
@@ -86,6 +86,8 @@ static void cm_init_context_common(cpu_context_t *ctx, const entry_point_info_t
/* Clear any residual register values from the context */
memset(ctx, 0, sizeof(*ctx));
+ reg_ctx = get_regs_ctx(ctx);
+
/*
* Base the context SCR on the current value, adjust for entry point
* specific requirements
@@ -121,8 +123,6 @@ static void cm_init_context_common(cpu_context_t *ctx, const entry_point_info_t
if (GET_M32(ep->spsr) == MODE32_hyp)
scr |= SCR_HCE_BIT;
- reg_ctx = get_regs_ctx(ctx);
-
write_ctx_reg(reg_ctx, CTX_SCR, scr);
write_ctx_reg(reg_ctx, CTX_LR, ep->pc);
write_ctx_reg(reg_ctx, CTX_SPSR, ep->spsr);