From nobody Wed Oct 8 16:04:26 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31A9E21ABB7; Fri, 27 Jun 2025 07:13:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751008381; cv=none; b=LyCoftCGDnDa0YpMKHaQ+AuPmRc22G8RFKI0yAkK90VqFcQWkAsvc9d+YsFQ4aHrBCox1TaF3xjg6NQ0I7baFZooALVQiwHiehrQ0kg3jHANKQvyEyOGoLWBU3iC0Wzcm/7xxF4T4L6pkx1ya2cR5vlg5X/OE01/xJEtXIiR8JM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751008381; c=relaxed/simple; bh=5aPHBqgghaNXr+qmy8IWnHIq6Bg8C3t/68W+2vw4Hqc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KjnNf/4gS22eSIzpgbVkQmRHlebczUwbK2LOdPECvMko0ATKiafwxO2Xa/JAtWV0YcIq3iFd5HBSaF1DHuoVIZtWZlgLeIXj9j0si+qdojo6aOHZN1PCdFLHSjB0koJ04TremEfw1lS+5j8jtZ8YKrB8jifkSm4Np2SybwtD6Rk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Nb704Dww; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Nb704Dww" Received: by smtp.kernel.org (Postfix) with ESMTPS id D61CCC4CEF5; Fri, 27 Jun 2025 07:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751008380; bh=5aPHBqgghaNXr+qmy8IWnHIq6Bg8C3t/68W+2vw4Hqc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Nb704Dwwwr1W+SXUmHskF5rcaXk7HWza396g3R3+cyEsZnDlWVxduxXPwVOBWGH7W lg7yDGFxwPlcPMUy5m0xeb23IX2H41ZkxbdE4DixuRKyrfHUqV2dmsnDoRsrDj6p8/ qj1vJEIZvstHFGvGKxb1cJqqpqLhcrPP6NBGNuDaC0UYPYv0Ivkjp3FC375Rep0zL9 FUkuiCYZpmh5vkcfU1dXyrbyfxa/3Q44YsMLS9hAHfpaHCbHX02WF3A3pGpBDc4UiI MWgQ0i3uK0H7P+g+pq6zUN4YBBvBgOEtnG4PV2FAM3I8HO4VNSKxQaTv1fVVOA75Wo AzWaWB1qXBS4w== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9823C7EE39; Fri, 27 Jun 2025 07:13:00 +0000 (UTC) From: Per Larsen via B4 Relay Date: Fri, 27 Jun 2025 07:12:28 +0000 Subject: [PATCH v6 4/5] KVM: arm64: Bump the supported version of FF-A to 1.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250627-virtio-msg-ffa-v6-4-8c02fd94edac@google.com> References: <20250627-virtio-msg-ffa-v6-0-8c02fd94edac@google.com> In-Reply-To: <20250627-virtio-msg-ffa-v6-0-8c02fd94edac@google.com> To: Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , Sudeep Holla Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, ahomescu@google.com, armellel@google.com, arve@android.com, ayrton@google.com, qperret@google.com, sebastianene@google.com, qwandor@google.com, Per Larsen X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1751008380; l=2907; i=perlarsen@google.com; s=20250508; h=from:subject:message-id; bh=7rEMvl8SoHWGrwsNRCeFHM4pJ2DEx095GGBAAYP+euA=; b=QnK7PyFg+Sp9K6Dvzow+2ecO2qkpCoOzOMEHl/0e83G3yL4lNUY+S4v5SH+Ij7bEHDL4HwwGk x3mbjSjVhOkC41qM06xylFeNwkfA+dNHlMPJqkD9QyOCWcBsxd9IFIY X-Developer-Key: i=perlarsen@google.com; a=ed25519; pk=jjc/Ta4VmrLRmMoahP6d1mBcKzvWU+nsmdtYe2oS2kQ= X-Endpoint-Received: by B4 Relay for perlarsen@google.com/20250508 with auth_id=402 X-Original-From: Per Larsen Reply-To: perlarsen@google.com From: Per Larsen FF-A version 1.2 introduces the DIRECT_REQ2 ABI. Bump the FF-A version preferred by the hypervisor as a precursor to implementing the 1.2-only FFA_MSG_SEND_DIRECT_REQ2 and FFA_MSG_SEND_RESP2 messaging interfaces. We must also use SMCCC 1.2 for 64-bit SMCs if hypervisor negotiated FF-A 1.2, so ffa_set_retval is updated and a new function to call 64-bit smcs using SMCCC 1.2 with fallback to SMCCC 1.1 is introduced. Update ffa_call_supported to mark FF-A 1.2 interfaces as unsupported lest they get forwarded. Co-developed-by: Ayrton Munoz Signed-off-by: Ayrton Munoz Signed-off-by: Per Larsen --- arch/arm64/kvm/hyp/nvhe/ffa.c | 14 ++++++++++---- include/linux/arm_ffa.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index 5fd6474d96ae4b90d99796ee81bb36373219afc4..d543d1f5ddd62fb15f8d39f4ff7= d5bb0006da4a1 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -678,6 +678,12 @@ static bool ffa_call_supported(u64 func_id) case FFA_NOTIFICATION_SET: case FFA_NOTIFICATION_GET: case FFA_NOTIFICATION_INFO_GET: + /* Unimplemented interfaces added in FF-A 1.2 */ + case FFA_MSG_SEND_DIRECT_REQ2: + case FFA_MSG_SEND_DIRECT_RESP2: + case FFA_CONSOLE_LOG: + case FFA_PARTITION_INFO_GET_REGS: + case FFA_EL3_INTR_HANDLE: return false; } =20 @@ -734,7 +740,7 @@ static int hyp_ffa_post_init(void) if (res.a0 !=3D FFA_SUCCESS) return -EOPNOTSUPP; =20 - switch (res.a2) { + switch (res.a2 & FFA_FEAT_RXTX_MIN_SZ_MASK) { case FFA_FEAT_RXTX_MIN_SZ_4K: min_rxtx_sz =3D SZ_4K; break; @@ -931,7 +937,7 @@ int hyp_ffa_init(void *pages) =20 arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 =3D FFA_VERSION, - .a1 =3D FFA_VERSION_1_1, + .a1 =3D FFA_VERSION_1_2, }, &res); if (res.a0 =3D=3D FFA_RET_NOT_SUPPORTED) return 0; @@ -952,10 +958,10 @@ int hyp_ffa_init(void *pages) if (FFA_MAJOR_VERSION(res.a0) !=3D 1) return -EOPNOTSUPP; =20 - 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 =3D res.a0; else - hyp_ffa_version =3D FFA_VERSION_1_1; + hyp_ffa_version =3D FFA_VERSION_1_2; =20 tx =3D pages; pages +=3D KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE; diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h index 5bded24dc24fea8cdcbe42bf79c7c025c3fa5f4b..c0dd6183d956043192114a522b7= eef465e7078ac 100644 --- a/include/linux/arm_ffa.h +++ b/include/linux/arm_ffa.h @@ -128,6 +128,7 @@ #define FFA_FEAT_RXTX_MIN_SZ_4K 0 #define FFA_FEAT_RXTX_MIN_SZ_64K 1 #define FFA_FEAT_RXTX_MIN_SZ_16K 2 +#define FFA_FEAT_RXTX_MIN_SZ_MASK 3 =20 /* FFA Bus/Device/Driver related */ struct ffa_device { --=20 2.50.0.727.gbf7dc18ff4-goog