Skip to content

Commit 162190f

Browse files
Per LarsenMarc Zyngier
authored andcommitted
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>
1 parent 3f59529 commit 162190f

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

  • arch/arm64/kvm/hyp/nvhe

arch/arm64/kvm/hyp/nvhe/ffa.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ int hyp_ffa_init(void *pages)
936936

937937
arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) {
938938
.a0 = FFA_VERSION,
939-
.a1 = FFA_VERSION_1_1,
939+
.a1 = FFA_VERSION_1_2,
940940
}, &res);
941941
if (res.a0 == FFA_RET_NOT_SUPPORTED)
942942
return 0;
@@ -957,10 +957,10 @@ int hyp_ffa_init(void *pages)
957957
if (FFA_MAJOR_VERSION(res.a0) != 1)
958958
return -EOPNOTSUPP;
959959

960-
if (FFA_MINOR_VERSION(res.a0) < FFA_MINOR_VERSION(FFA_VERSION_1_1))
960+
if (FFA_MINOR_VERSION(res.a0) < FFA_MINOR_VERSION(FFA_VERSION_1_2))
961961
hyp_ffa_version = res.a0;
962962
else
963-
hyp_ffa_version = FFA_VERSION_1_1;
963+
hyp_ffa_version = FFA_VERSION_1_2;
964964

965965
tx = pages;
966966
pages += KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE;

0 commit comments

Comments
 (0)