andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Dimitris Papastamos 2019-03-13 13:59:00 +00:00 committed by GitHub
parent 36a540d6c8 520f864e66
commit e082009e05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bl1/aarch32/bl1_exceptions.S
View File

@ -71,7 +71,7 @@ debug_loop:
*/
ldr lr, [r8, #ENTRY_POINT_INFO_PC_OFFSET]
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 */
cps #MODE32_svc

2
bl2/aarch32/bl2_el3_entrypoint.S
View File

@ -78,7 +78,7 @@ func bl2_run_next_image
*/
ldr lr, [r8, #ENTRY_POINT_INFO_PC_OFFSET]
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 */
cps #MODE32_svc