From nobody Thu Oct 9 08:58:47 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 7C101283C8D; Thu, 19 Jun 2025 09:03:28 +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=1750323808; cv=none; b=WPXW3u1THikzu0U3xVKJWsP8r3lp6RIv1cr96Zh2pf8yql1UUgCvuLSYT7sZAj1WJCokIOrR9kPJzNAc9iYkjhF1LLCPiG9d9SSeYRj63zaBs1CbHhI3GGCTDu3RKQ8man6SidGaBne9AQWLKfyzEXdtCx+/hPH5Ame5mj1OdM8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750323808; c=relaxed/simple; bh=KV8R0/QEn6g2ep7ALMFbJDB+CZVez+rknXrVOIag/1o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GgyrCV0i6cyiPmllnWFQR3bQtCIXvalmDVNCr7mTpJCFQKw5p9+yQVcBFfVrhti7mNwGlarkmr7nW7ZhcYl5aITgEINi1yyVKHe3h5Nf85tDcDK/yvPpDk/3QABUBBoQfJHZMA4AuPY5W2YC35kF8m/7wxbDBMaHyaAjkbfV1N4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ciuGSV4F; 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="ciuGSV4F" Received: by smtp.kernel.org (Postfix) with ESMTPS id 57C54C4CEF8; Thu, 19 Jun 2025 09:03:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750323808; bh=KV8R0/QEn6g2ep7ALMFbJDB+CZVez+rknXrVOIag/1o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ciuGSV4FFn9j7Vu0f/6GjGsvMlYID+PmLSv4P2o3D3s0gSZZpnhU44u1yAcEiS4rn 1O6w3fpmukAQR6m9HNreg59k143ObCx51qHhrhdqpXgDN+9JNHBMebH1cZFAh2dSg3 C0RcJRkXnyYK0Rouy86JlWkxjYyJZCMLZ1vo/ufH1nI3+VyJlpMJIuN/V4iCByiPhi B3iSEadzIyN9rWYOHNzKrG3aSapf1+O+IRd3+pNnMaREGJiKGlcRi/M8LOBYGGRUz3 dcGJo/6L5fkBUi1shUNVbVgYPtqZsBPNNBGSqtv7C3OVybXHKIH9XU6Qwt5Pp/hMe/ 3m36h13UOUiDg== 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 4F786C77B7C; Thu, 19 Jun 2025 09:03:28 +0000 (UTC) From: Per Larsen via B4 Relay Date: Thu, 19 Jun 2025 09:02:58 +0000 Subject: [PATCH v5 5/6] 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: <20250619-virtio-msg-ffa-v5-5-412c98558807@google.com> References: <20250619-virtio-msg-ffa-v5-0-412c98558807@google.com> In-Reply-To: <20250619-virtio-msg-ffa-v5-0-412c98558807@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, Ayrton Munoz , Per Larsen X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1750323807; l=2922; i=perlarsen@google.com; s=20250508; h=from:subject:message-id; bh=FWsM9cwpDtQRn26k1vqArnhcGBTBM4Gr3l2A+zKhWqA=; b=xKbIaeh0Ao2PAFj3bfDz6jesWsBv+WwmJNQ732uSf7QXPWRDCk6XboOcFJb6704n1VDjaO3c8 Qwou+1cKSBlCvSH2UVdzBY81BmeQyBfH1/dzYLEa6zJp43/mG+8b2GX 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 6965aa947fb4529c35872ee3976ab8d0b02becca..7b43279aded7d7ef4cce2c294d2= 08c5a66b684e3 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -677,6 +677,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 (regs.a0 !=3D FFA_SUCCESS) return -EOPNOTSUPP; =20 - switch (regs.a2) { + switch (regs.a2 & FFA_FEAT_RXTX_MIN_SZ_MASK) { case FFA_FEAT_RXTX_MIN_SZ_4K: min_rxtx_sz =3D SZ_4K; break; @@ -933,7 +939,7 @@ int hyp_ffa_init(void *pages) =20 regs =3D (struct arm_smccc_1_2_regs) { .a0 =3D FFA_VERSION, - .a1 =3D FFA_VERSION_1_1, + .a1 =3D FFA_VERSION_1_2, }; arm_smccc_1_2_smc(®s, ®s); if (regs.a0 =3D=3D FFA_RET_NOT_SUPPORTED) @@ -955,10 +961,10 @@ int hyp_ffa_init(void *pages) if (FFA_MAJOR_VERSION(regs.a0) !=3D 1) return -EOPNOTSUPP; =20 - if (FFA_MINOR_VERSION(regs.a0) < FFA_MINOR_VERSION(FFA_VERSION_1_1)) + if (FFA_MINOR_VERSION(regs.a0) < FFA_MINOR_VERSION(FFA_VERSION_1_2)) hyp_ffa_version =3D regs.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.rc2.701.gf1e915cc24-goog