Skip to content

Commit 023274d

Browse files
author
Daniel Rossier
committed
Fix use of bad stack in EL1 mode
1 parent 27ffea8 commit 023274d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

so3/arch/arm64/exception.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ ENTRY(pre_ret_to_el1_with_spin)
226226
// Set the CPU in EL1 mode to proceed with
227227
// the bootstrap of the domain
228228

229-
mov x2, #PSR_MODE_EL1t
229+
mov x2, #PSR_MODE_EL1h
230230

231231
// Make sure no interrupt coming from CPU #0 is
232232
// interferring with other CPU bootstrap
@@ -271,7 +271,7 @@ ENTRY(pre_ret_to_el1)
271271
// Set the CPU in EL1 mode to proceed with
272272
// the bootstrap of the domain
273273

274-
mov x2, #PSR_MODE_EL1t
274+
mov x2, #PSR_MODE_EL1h
275275

276276
// Make sure no interrupt coming from CPU #0 is
277277
// interferring with other CPU bootstrap

so3/arch/arm64/head.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ install_el2_stub:
424424
msr vbar_el2, x0
425425

426426
/* spsr */
427-
mov x0, #(PSR_F_BIT | PSR_I_BIT | PSR_A_BIT | PSR_D_BIT | PSR_MODE_EL1t)
427+
mov x0, #(PSR_F_BIT | PSR_I_BIT | PSR_A_BIT | PSR_D_BIT | PSR_MODE_EL1h)
428428
msr spsr_el2, x0
429429
msr elr_el2, lr
430430
mov w0, #BOOT_CPU_MODE_EL2 // This CPU booted in EL2

0 commit comments

Comments
 (0)