From nobody Thu Oct 9 09:07:00 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 54BD52836A2; 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=Z7QqR2Ruvg9BXEDV8W9TCTi/Iw6b6NjC1kutQHWKrMc47HQCeLEuiait2MyQNKtDhS86Q4XslDXsGEb/Mb2YglUrafQmUVakO1tjr1W9HaTHvofY/2SgqacPz49inPJ0Hma+2KsK/N3pGtvrikuHpJkyjBzhR7OiqYKffbXx34M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750323808; c=relaxed/simple; bh=g7HbEMSGC7lValARRez43Mn+S/OKci/SL+Q0rQG8aK4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RTzYW6FSPNyJpD3Q8z0pokPaZtXaLZP6pkML3vk+3RabYjhFS/vbUlu0Gkn7cLgfo7ZEFnd3T86z7OCX3WzM/Zlfiwaxj3lYcBkYmpzgK7YfSfhqkh04BQDoO8DAs3t7mOHFLr/y9VxZQlFFCisAAbIJxKuEDgE5FDYa4NyOPR8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nuFbpL6R; 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="nuFbpL6R" Received: by smtp.kernel.org (Postfix) with ESMTPS id 2F467C4CEEF; 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=g7HbEMSGC7lValARRez43Mn+S/OKci/SL+Q0rQG8aK4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=nuFbpL6Rirc8bxX5o3c+T0kadHRpuu1p28lL3aYG6WxxTPOZAPEKim1Fxsmb4iCep H1MeLBDynHn+101dTIabq8K/cur45ragSvjKYn0Whg7kzXJDktjw+4xaIaN/k5vjxr syb9y8FkwHAlMHmiH9z+JpmdqZd9SF1T7DQ4/UtKuaqcRVK9ISYmOQz6OG7x9q/yMY tbbCJQ1VJdcJ2KTft004ofGAcCHaAUDht9JBuFh7nniYrn5CTMWVBP5HL4jEKD424J FCq5MToo99O5zviEqSwGzh8/AWst958dWxkN1T8M53k5zfSx3w9WEe1kkVcAKUOSCM 6wdpO2hqYPezg== 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 22F8AC7115B; Thu, 19 Jun 2025 09:03:28 +0000 (UTC) From: Per Larsen via B4 Relay Date: Thu, 19 Jun 2025 09:02:55 +0000 Subject: [PATCH v5 2/6] KVM: arm64: Use SMCCC 1.2 in hyp_ffa_{init,post_init} 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-2-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, Per Larsen X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1750323807; l=3417; i=perlarsen@google.com; s=20250508; h=from:subject:message-id; bh=ITbJy+U88TKFuEMoRcW/LDBaFV7Te3dLSP/C39fWi6U=; b=a8Q66bWbjAHiQ8So3UnvJcSeMp19/fIenT+YRS/1O5zV5OnYaPiSu2af0Z4rlfF2M6oWkHJWh vTfvBA8/qEqDtKNd7cF0z5mfSYGrlPmEZDS9nSQBUlMO+JpUrfd9bew 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 is based on SMCCC 1.2. Move the FF-A initialization code to SMCCC 1.2 as it simplifies later changes in this patchset. Signed-off-by: Per Larsen --- arch/arm64/kvm/hyp/nvhe/Makefile | 1 + arch/arm64/kvm/hyp/nvhe/ffa.c | 37 +++++++++++++++++++++++-------------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Mak= efile index a76522d63c3e630795db5972a99abc3d24bc5e26..f859a8fb41a25effea1edd977be= f889423153399 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -27,6 +27,7 @@ hyp-obj-y :=3D timer-sr.o sysreg-sr.o debug-sr.o switch.o= tlb.o hyp-init.o host.o cache.o setup.o mm.o mem_protect.o sys_regs.o pkvm.o stacktrace.o ffa.o hyp-obj-y +=3D ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../en= try.o \ ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o +hyp-obj-y +=3D ../../../kernel/smccc-call.o hyp-obj-$(CONFIG_LIST_HARDENED) +=3D list_debug.o hyp-obj-y +=3D $(lib-objs) =20 diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index 2c199d40811efb5bfae199c4a67d8ae3d9307357..51bbe8f9c94584e9001ee769cbf= d608d930ff723 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -666,21 +666,26 @@ static bool do_ffa_features(struct arm_smccc_res *res, static int hyp_ffa_post_init(void) { size_t min_rxtx_sz; - struct arm_smccc_res res; + struct arm_smccc_1_2_regs regs =3D { + .a0 =3D FFA_ID_GET, + }; =20 - arm_smccc_1_1_smc(FFA_ID_GET, 0, 0, 0, 0, 0, 0, 0, &res); - if (res.a0 !=3D FFA_SUCCESS) + arm_smccc_1_2_smc(®s, ®s); + if (regs.a0 !=3D FFA_SUCCESS) return -EOPNOTSUPP; =20 - if (res.a2 !=3D HOST_FFA_ID) + if (regs.a2 !=3D HOST_FFA_ID) return -EINVAL; =20 - arm_smccc_1_1_smc(FFA_FEATURES, FFA_FN64_RXTX_MAP, - 0, 0, 0, 0, 0, 0, &res); - if (res.a0 !=3D FFA_SUCCESS) + regs =3D (struct arm_smccc_1_2_regs){ + .a0 =3D FFA_FEATURES, + .a1 =3D FFA_FN64_RXTX_MAP, + }; + arm_smccc_1_2_smc(®s, ®s); + if (regs.a0 !=3D FFA_SUCCESS) return -EOPNOTSUPP; =20 - switch (res.a2) { + switch (regs.a2) { case FFA_FEAT_RXTX_MIN_SZ_4K: min_rxtx_sz =3D SZ_4K; break; @@ -863,14 +868,18 @@ bool kvm_host_ffa_handler(struct kvm_cpu_context *hos= t_ctxt, u32 func_id) =20 int hyp_ffa_init(void *pages) { - struct arm_smccc_res res; + struct arm_smccc_1_2_regs regs; void *tx, *rx; =20 if (kvm_host_psci_config.smccc_version < ARM_SMCCC_VERSION_1_2) return 0; =20 - arm_smccc_1_1_smc(FFA_VERSION, FFA_VERSION_1_1, 0, 0, 0, 0, 0, 0, &res); - if (res.a0 =3D=3D FFA_RET_NOT_SUPPORTED) + regs =3D (struct arm_smccc_1_2_regs) { + .a0 =3D FFA_VERSION, + .a1 =3D FFA_VERSION_1_1, + }; + arm_smccc_1_2_smc(®s, ®s); + if (regs.a0 =3D=3D FFA_RET_NOT_SUPPORTED) return 0; =20 /* @@ -886,11 +895,11 @@ int hyp_ffa_init(void *pages) * ABI return NOT_SUPPORTED rather than a version number, according to * DEN0077A v1.1 REL0 18.6.4. */ - if (FFA_MAJOR_VERSION(res.a0) !=3D 1) + if (FFA_MAJOR_VERSION(regs.a0) !=3D 1) return -EOPNOTSUPP; =20 - if (FFA_MINOR_VERSION(res.a0) < FFA_MINOR_VERSION(FFA_VERSION_1_1)) - hyp_ffa_version =3D res.a0; + if (FFA_MINOR_VERSION(regs.a0) < FFA_MINOR_VERSION(FFA_VERSION_1_1)) + hyp_ffa_version =3D regs.a0; else hyp_ffa_version =3D FFA_VERSION_1_1; =20 --=20 2.50.0.rc2.701.gf1e915cc24-goog