Merge pull request #1877 from bryanodonoghue/integration+bl2-el3-eret-fix-v2
bl2-el3: Fix exit to bl32 by ensuring full write to SPSR
This commit is contained in:
commit
e082009e05
|
@ -71,7 +71,7 @@ debug_loop:
|
||||||
*/
|
*/
|
||||||
ldr lr, [r8, #ENTRY_POINT_INFO_PC_OFFSET]
|
ldr lr, [r8, #ENTRY_POINT_INFO_PC_OFFSET]
|
||||||
ldr r1, [r8, #(ENTRY_POINT_INFO_PC_OFFSET + 4)]
|
ldr r1, [r8, #(ENTRY_POINT_INFO_PC_OFFSET + 4)]
|
||||||
msr spsr, r1
|
msr spsr_xc, r1
|
||||||
|
|
||||||
/* Some BL32 stages expect lr_svc to provide the BL33 entry address */
|
/* Some BL32 stages expect lr_svc to provide the BL33 entry address */
|
||||||
cps #MODE32_svc
|
cps #MODE32_svc
|
||||||
|
|
|
@ -78,7 +78,7 @@ func bl2_run_next_image
|
||||||
*/
|
*/
|
||||||
ldr lr, [r8, #ENTRY_POINT_INFO_PC_OFFSET]
|
ldr lr, [r8, #ENTRY_POINT_INFO_PC_OFFSET]
|
||||||
ldr r1, [r8, #(ENTRY_POINT_INFO_PC_OFFSET + 4)]
|
ldr r1, [r8, #(ENTRY_POINT_INFO_PC_OFFSET + 4)]
|
||||||
msr spsr, r1
|
msr spsr_xc, r1
|
||||||
|
|
||||||
/* Some BL32 stages expect lr_svc to provide the BL33 entry address */
|
/* Some BL32 stages expect lr_svc to provide the BL33 entry address */
|
||||||
cps #MODE32_svc
|
cps #MODE32_svc
|
||||||
|
|
Loading…
Reference in New Issue