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 <alanstokes@google.com> Bug: 222663556 Signed-off-by: Will Deacon <willdeacon@google.com> Change-Id: I41e9ff35f169df3609acee7bbc67999c1d11c9d1
diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index e433dfa..0754af8 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c
@@ -862,7 +862,7 @@ int hyp_ffa_init(void *pages) struct arm_smccc_res res; 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_1, 0, 0, 0, 0, 0, 0, &res);