From: Deepika Bhavnani Date: Tue, 3 Sep 2019 18:08:51 +0000 (+0300) Subject: SCTLR and ACTLR are 32-bit for AArch32 and 64-bit for AArch64 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=eeb5a7b595ebe938c3cf720507c5474a8ea3153b;p=project%2Fbcm63xx%2Fatf.git SCTLR and ACTLR are 32-bit for AArch32 and 64-bit for AArch64 AArch64 System register SCTLR_EL1[31:0] is architecturally mapped to AArch32 System register SCTLR[31:0] AArch64 System register ACTLR_EL1[31:0] is architecturally mapped to AArch32 System register ACTLR[31:0]. `u_register_t` should be used when it's important to store the contents of a register in its native size Signed-off-by: Deepika Bhavnani Change-Id: I0055422f8cc0454405e011f53c1c4ddcaceb5779 --- diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c index 446d9da9..a05ee5a6 100644 --- a/lib/el3_runtime/aarch64/context_mgmt.c +++ b/lib/el3_runtime/aarch64/context_mgmt.c @@ -69,7 +69,7 @@ void cm_setup_context(cpu_context_t *ctx, const entry_point_info_t *ep) uint32_t scr_el3; el3_state_t *state; gp_regs_t *gp_regs; - unsigned long sctlr_elx, actlr_elx; + u_register_t sctlr_elx, actlr_elx; assert(ctx != NULL);