KVM: arm64: Bump the supported version of FF-A to 1.2

FF-A version 1.2 introduces the DIRECT_REQ2 ABI. Bump the FF-A version
preferred by the hypervisor to enable implementation of the 1.2-only
FFA_MSG_SEND_DIRECT_REQ2 and FFA_MSG_SEND_RESP2 messaging interfaces.

Co-developed-by: Ayrton Munoz <ayrton@google.com>
Signed-off-by: Ayrton Munoz <ayrton@google.com>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Per Larsen <perlarsen@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c
index a8ec1a94f3f8a86551895f4606918246c4ac1f39..4e16f9b96f637599873b16148c6e40cf1210aa3e 100644 (file)
--- a/arch/arm64/kvm/hyp/nvhe/ffa.c
+++ b/arch/arm64/kvm/hyp/nvhe/ffa.c
@@ -936,7 +936,7 @@ int hyp_ffa_init(void *pages)
 
        arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) {
                .a0 = FFA_VERSION,
-               .a1 = FFA_VERSION_1_1,
+               .a1 = FFA_VERSION_1_2,
        }, &res);
        if (res.a0 == FFA_RET_NOT_SUPPORTED)
                return 0;
@@ -957,10 +957,10 @@ int hyp_ffa_init(void *pages)
        if (FFA_MAJOR_VERSION(res.a0) != 1)
                return -EOPNOTSUPP;
 
-       if (FFA_MINOR_VERSION(res.a0) < FFA_MINOR_VERSION(FFA_VERSION_1_1))
+       if (FFA_MINOR_VERSION(res.a0) < FFA_MINOR_VERSION(FFA_VERSION_1_2))
                hyp_ffa_version = res.a0;
        else
-               hyp_ffa_version = FFA_VERSION_1_1;
+               hyp_ffa_version = FFA_VERSION_1_2;
 
        tx = pages;
        pages += KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE;