aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Deprez <olivier.deprez@arm.com>2020-03-03 16:25:45 +0100
committerOlivier Deprez <olivier.deprez@arm.com>2020-07-22 16:10:38 +0000
commit56a62c961d2851dd242d5c8fa43c83f749711c18 (patch)
treed510d655f0a58e805309ef7c4e02c23b8e948b2a
parentab1081d2036716cb1a5aabe4dde837b5f6fd3fc6 (diff)
downloadhafnium-56a62c961d2851dd242d5c8fa43c83f749711c18.tar.gz
psci: prevent version service call from S-EL2
S-EL2 to EL3 PSCI interface design is WIP. For now do not propagate PSCI calls from Hafnium down to EL3/PSCI layer. Change-Id: I38c083efe7e6f414ed7ddd927011cddefe86d583 Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
-rw-r--r--src/arch/aarch64/hypervisor/psci_handler.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/arch/aarch64/hypervisor/psci_handler.c b/src/arch/aarch64/hypervisor/psci_handler.c
index 55704d4..f89a00b 100644
--- a/src/arch/aarch64/hypervisor/psci_handler.c
+++ b/src/arch/aarch64/hypervisor/psci_handler.c
@@ -30,6 +30,7 @@ void cpu_entry(struct cpu *c);
/* Performs arch specific boot time initialisation. */
void arch_one_time_init(void)
{
+#if SECURE_WORLD == 0
struct ffa_value smc_res =
smc32(PSCI_VERSION, 0, 0, 0, 0, 0, 0, SMCCC_CALLER_HYPERVISOR);
@@ -50,6 +51,9 @@ void arch_one_time_init(void)
el3_psci_version = 0;
break;
}
+#else
+ el3_psci_version = PSCI_VERSION_1_1;
+#endif
}
/**