Merge pull request #1301 from ldebieve/lde/issue-tf#562

bl2-el3: Fix bl32 lr_svc used for bl33 entry address

Merge pull request #1301 from ldebieve/lde/issue-tf#562
bl2-el3: Fix bl32 lr_svc used for bl33 entry address
887f2402 · davidcunado-arm · GitHub · f918bca3 · a24dbdcc · 887f2402
Unverified Commit 887f2402 authored 7 years ago by davidcunado-arm Committed by GitHub 7 years ago
Show whitespace changes
Inline Side-by-side

Showing

with 5 additions and 0 deletions
+5 -0
--- a/bl2/aarch32/bl2_el3_entrypoint.S
+++ b/bl2/aarch32/bl2_el3_entrypoint.S
@@ -78,6 +78,11 @@ func bl2_run_next_image
 	ldr	r1, [r8, #(ENTRY_POINT_INFO_PC_OFFSET + 4)]
 	msr	spsr, r1

+	/* Some BL32 stages expect lr_svc to provide the BL33 entry address */
+	cps	#MODE32_svc
+	ldr	lr, [r8, #ENTRY_POINT_INFO_LR_SVC_OFFSET]
+	cps	#MODE32_mon
+
 	add	r8, r8, #ENTRY_POINT_INFO_ARGS_OFFSET
 	ldm	r8, {r0, r1, r2, r3}
 	eret