From 02005f5d104e0d12d98a83376b25500fac69df6d Mon Sep 17 00:00:00 2001
From: Jouni Ukkonen <jouni.ukkonen@unikie.com>
Date: Wed, 14 Aug 2024 11:03:03 +0300
Subject: [PATCH] arm64: fix jump address to el2 entry when leaving el3

Signed-off-by: Jouni Ukkonen <jouni.ukkonen@unikie.com>
---
 arch/arm64/src/common/arm64_head.S | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/src/common/arm64_head.S b/arch/arm64/src/common/arm64_head.S
index 55a89ec06eaf4..776d114e53420 100644
--- a/arch/arm64/src/common/arm64_head.S
+++ b/arch/arm64/src/common/arm64_head.S
@@ -243,10 +243,8 @@ switch_el:
     mov   sp, x24
     b     el3_boot
 #endif
-
-    /* Get next EL */
-
-    adr   x0, switch_el
+    /* Jump to EL2 */
+    adr   x0, 2f
     bl    arm64_boot_el3_get_next_el
     eret
 #endif