From 8eaec3fe4a30a7ff6e8a3fbdf6f9208e1840037e Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Fri, 4 Mar 2022 17:24:25 +0000 Subject: [PATCH] ANDROID: KVM: arm64: Relax SMCCC version check during FF-A proxy init Although FF-A claims to require version v1.2 of SMCCC, in reality the current set of calls work just fine with v1.1 and some devices ship with EL3 firmware that advertises this configuration. Allow pKVM to proxy FF-A calls for these devices by relaxing our SMCCC version check to permit SMCCC v1.1+ Reported-by: Alan Stokes Bug: 222663556 Signed-off-by: Will Deacon Change-Id: I41e9ff35f169df3609acee7bbc67999c1d11c9d1 Signed-off-by: Quentin Perret --- arch/arm64/kvm/hyp/nvhe/ffa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index 61003c3b6445..4d1c3c85b47d 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -677,7 +677,7 @@ int hyp_ffa_init(void *pages) size_t min_rxtx_sz; void *tx, *rx; - if (kvm_host_psci_config.smccc_version < ARM_SMCCC_VERSION_1_2) + if (kvm_host_psci_config.smccc_version < ARM_SMCCC_VERSION_1_1) return 0; arm_smccc_1_1_smc(FFA_VERSION, FFA_VERSION_1_0, 0, 0, 0, 0, 0, 0, &res);