Re: [boot-wrapper PATCH v2 4/8] aarch64: Prepare for EL1 booting
From: Andre Przywara <andre.przywara@arm.com>
Date: 2021-05-24 22:43:23
On Fri, 21 May 2021 18:48:03 +0800 Jaxson Han [off-list ref] wrote:
When booting from EL1, add a check and skip the init of sctlr_el2 in jump_kernel Signed-off-by: Jaxson Han <redacted>
Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre
quoted hunk ↗ jump to hunk
--- arch/aarch64/boot.S | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S index ee9886b..b8f9e4e 100644 --- a/arch/aarch64/boot.S +++ b/arch/aarch64/boot.S@@ -144,10 +144,14 @@ jump_kernel: ldr x0, =SCTLR_EL1_RESET msr sctlr_el1, x0 + mrs x0, CurrentEL + cmp x0, #CURRENTEL_EL2 + b.lt 1f + ldr x0, =SCTLR_EL2_RESET msr sctlr_el2, x0 - cpuid x0, x1 +1: cpuid x0, x1 bl find_logical_id bl setup_stack // Reset stack pointer
_______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel