[PATCH v2 1/6] aarch64: Rename labels and prepare for lower EL booting
Luca Fancellu
luca.fancellu at arm.com
Tue Jul 16 07:29:01 PDT 2024
The current code can boot from a lower EL than EL3, but the flag
'flag_no_el3' have the meaning of "Don't drop to a lower EL", so
rename the flag to flag_keep_el.
This is a preparation work to boot on Armv8-R AArch64 which has
no EL3.
Signed-off-by: Luca Fancellu <luca.fancellu at arm.com>
Reviewed-by: Andre Przywara <andre.przywara at arm.com>
---
v2 changes:
- Add Andre R-by
---
arch/aarch64/boot.S | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S
index da5fa6548b65..7727475925c1 100644
--- a/arch/aarch64/boot.S
+++ b/arch/aarch64/boot.S
@@ -92,7 +92,7 @@ reset_no_el3:
bl setup_stack
mov w0, #1
- ldr x1, =flag_no_el3
+ ldr x1, =flag_keep_el
str w0, [x1]
bl cpu_init_bootwrapper
@@ -124,7 +124,7 @@ ASM_FUNC(jump_kernel)
bl find_logical_id
bl setup_stack // Reset stack pointer
- ldr w0, flag_no_el3
+ ldr w0, flag_keep_el
cmp w0, #0 // Prepare Z flag
mov x0, x20
@@ -133,7 +133,7 @@ ASM_FUNC(jump_kernel)
mov x3, x23
b.eq 1f
- br x19 // No EL3
+ br x19 // Keep EL
1: mov x4, #SPSR_KERNEL
@@ -151,5 +151,5 @@ ASM_FUNC(jump_kernel)
.data
.align 3
-flag_no_el3:
+flag_keep_el:
.long 0
--
2.34.1
More information about the linux-arm-kernel
mailing list