From: Michael Walle <michael@walle.cc>
Date: Mon, 28 Feb 2022 12:48:39 +0000 (+0100)
Subject: armv8: psci: skip setup code if we are not EL3
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=de58ac49a5d941a053008bf395c862efc34b5595;p=u-boot.git

armv8: psci: skip setup code if we are not EL3

If we are running in EL2 skip PSCI implementation setup. This avoids an
exception if CONFIG_ARMV8_PSCI is set, but u-boot is started by TF-A.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
---

diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c
index ea40c55dd2..db5d460eb4 100644
--- a/arch/arm/cpu/armv8/cpu.c
+++ b/arch/arm/cpu/armv8/cpu.c
@@ -79,6 +79,9 @@ static void relocate_secure_section(void)
 
 void armv8_setup_psci(void)
 {
+	if (current_el() != 3)
+		return;
+
 	relocate_secure_section();
 	secure_ram_addr(psci_setup_vectors)();
 	secure_ram_addr(psci_arch_init)();