From nobody Sun Dec 14 06:19:58 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 05327286A1; Tue, 13 May 2025 06:29:00 +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=1747117741; cv=none; b=oWLYfaxW2sGB+8fya5u/6N/lvf2AcrmFwZXRF+HvvmnRdWBEG+1ARnD5VevHZVI+EgIejKSArZ1IwvS4wh9ZP5UT3WoyU/QZ7b/sj3HJKIZd1ZJ3nzgtUff43dMaRAfzMLQvi7rnnSeurFby5XyYtqwsBhXnI9JfhKDTNAz1piY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747117741; c=relaxed/simple; bh=CLiB3BFKvOs0u+oJcWhs7q0IQI+Q2pXyQ1Ro2L9QjrM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QBYMY5qbX08Mx+bVlAPFf4I9ZIEFijaVF4XXCXN5HBYMAbSErEzUUEcKwLgMmaZVo4dlMg/BkKXA5NzUUgzgZizL0BhVKHkST0BHDPZFYkhCkpNMBqA4VAwaDxmuVu7ddIHHdHkqCHvlPwGfQPIRQz1817ntW2SprQVU3YeZ+0A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TYicFCOJ; 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="TYicFCOJ" Received: by smtp.kernel.org (Postfix) with ESMTPS id 9643CC4CEF1; Tue, 13 May 2025 06:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747117740; bh=CLiB3BFKvOs0u+oJcWhs7q0IQI+Q2pXyQ1Ro2L9QjrM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=TYicFCOJExnXk1Cok6EHE1fWzkwa9r/NOP9TiM42eLnDeRzLbsORJUTZoYcqCvd4O igkZYktbjLI0x4gC/u5vZLPGxWykzOI30HRsAm+tNZiV+NU91aQqsEB/wFGyTyWQ1r zFGxbznGeEt0x6IsYgUDHh5lRSaDiR2AvgUxtmOJkgg4YwVgTjBk20gVZSv8tVKOSy VvjuD1lB1iEegJvubF5KXj9+OVE/QdP8dg7Reh3pN9UOdZmFwMPigyRwQd0yeuVRqN oMEjEgOjfuLf22GKdWoSB2cisCvPz2XmUrR1yMj+e7cPc1SoC7UniTilxPuuCBSMNQ esT1Z/WKTnjtA== 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 821B0C3ABC3; Tue, 13 May 2025 06:29:00 +0000 (UTC) From: Per Larsen via B4 Relay Date: Tue, 13 May 2025 06:28:31 +0000 Subject: [PATCH v3 2/3] 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: <20250513-virtio-msg-ffa-v3-2-d66c76ff1b2c@google.com> References: <20250513-virtio-msg-ffa-v3-0-d66c76ff1b2c@google.com> In-Reply-To: <20250513-virtio-msg-ffa-v3-0-d66c76ff1b2c@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, sebastianene@google.com, lpieralisi@kernel.org, arve@android.com, qwandor@google.com, kernel-team@android.com, armellel@google.com, perl@immunant.com, jean-philippe@linaro.org, ahomescu@google.com, tabba@google.com, qperret@google.com, james.morse@arm.com, Ayrton Munoz , Per Larsen X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747117739; l=7509; i=perlarsen@google.com; s=20250508; h=from:subject:message-id; bh=g+IX2CMQ1LETs57Pbs9qsYHceDkL3ouPwJ+4oHoRF5o=; b=dFfedZgYGlDwEbaPfeCO049PEXIVPIqOge8qgNLmQmzsVATQKLUYyipR2AL0kYjkp4adVphNa QFQCGa3m5W4BNqOhx6eT/5TbEBeNpLjeVgvZMCH25Yvfgn1v9J8n3B6 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 deny-list in ffa_call_supported to mark FFA_NOTIFICATION_* and interfaces added in FF-A 1.2 as unsupported lest they get forwarded. Co-developed-by: Ayrton Munoz Signed-off-by: Ayrton Munoz Signed-off-by: Per Larsen Signed-off-by: Per Larsen --- arch/arm64/kvm/hyp/include/nvhe/ffa.h | 1 + arch/arm64/kvm/hyp/nvhe/Makefile | 1 + arch/arm64/kvm/hyp/nvhe/ffa.c | 88 +++++++++++++++++++++++++++++++= +--- include/linux/arm_ffa.h | 1 + 4 files changed, 85 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/ffa.h b/arch/arm64/kvm/hyp/inc= lude/nvhe/ffa.h index 146e0aebfa1c7c9834c75a9a29bf87eb6f94f436..02def6fe51f5079b12c168585e1= 2f862211c4c91 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/ffa.h +++ b/arch/arm64/kvm/hyp/include/nvhe/ffa.h @@ -13,5 +13,6 @@ =20 int hyp_ffa_init(void *pages); bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id); +u32 ffa_get_hypervisor_version(void); =20 #endif /* __KVM_HYP_FFA_H */ diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Mak= efile index b43426a493df5a388caa920e259cc8c54d118a1b..95404ff16dac0389f45a3ee2c13= a93b3ebebaf6d 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..403fde6ca4d6ec49566ef60709c= edbaef9f04592 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -101,6 +101,55 @@ static void ffa_set_retval(struct kvm_cpu_context *ctx= t, cpu_reg(ctxt, 1) =3D res->a1; cpu_reg(ctxt, 2) =3D res->a2; cpu_reg(ctxt, 3) =3D res->a3; + + /* + * Other result registers must be zero per DEN0077A but SMC32/HVC32 must + * preserve x8-x30 per DEN0028. + */ + cpu_reg(ctxt, 4) =3D 0; + cpu_reg(ctxt, 5) =3D 0; + cpu_reg(ctxt, 6) =3D 0; + cpu_reg(ctxt, 7) =3D 0; + + /* + * Per DEN0077A v1.2 11.2, the caller is expected to write zeroes to + * unused parameter registers. + */ + if (ARM_SMCCC_IS_64(res->a0)) { + if (ffa_get_hypervisor_version() >=3D FFA_VERSION_1_2) { + cpu_reg(ctxt, 8) =3D 0; + cpu_reg(ctxt, 9) =3D 0; + cpu_reg(ctxt, 10) =3D 0; + cpu_reg(ctxt, 11) =3D 0; + cpu_reg(ctxt, 12) =3D 0; + cpu_reg(ctxt, 13) =3D 0; + cpu_reg(ctxt, 14) =3D 0; + cpu_reg(ctxt, 15) =3D 0; + cpu_reg(ctxt, 16) =3D 0; + cpu_reg(ctxt, 17) =3D 0; + } + } +} + +/* Call SMC64 using SMCCC 1.2 if hyp negotiated FF-A 1.2 falling back to 1= .1 */ +static void arm_smccc_1_x_smc(u64 func_id, u64 a1, u64 a2, u64 a3, + u64 a4, u64 a5, u64 a6, u64 a7, + struct arm_smccc_res *res) +{ + struct arm_smccc_1_2_regs args, regs =3D {0}; + + /* SMC64 only as SMC32 must preserve x8-x30 per DEN0028 1.6G Sec 2.6 */ + if (ARM_SMCCC_IS_64(func_id) && + ffa_get_hypervisor_version() >=3D FFA_VERSION_1_2) { + args =3D (struct arm_smccc_1_2_regs) { func_id, a1, a2, a3, a4, + a5, a6, a7 }; + arm_smccc_1_2_smc(&args, ®s); + *res =3D (struct arm_smccc_res) { .a0 =3D regs.a0, .a1 =3D regs.a1, + .a2 =3D regs.a2, .a3 =3D regs.a3 }; + return; + } + + arm_smccc_1_1_smc(func_id, a1, a2, a3, a4, a5, a6, a7, res); } =20 static bool is_ffa_call(u64 func_id) @@ -115,7 +164,7 @@ static int ffa_map_hyp_buffers(u64 ffa_page_count) { struct arm_smccc_res res; =20 - arm_smccc_1_1_smc(FFA_FN64_RXTX_MAP, + arm_smccc_1_x_smc(FFA_FN64_RXTX_MAP, hyp_virt_to_phys(hyp_buffers.tx), hyp_virt_to_phys(hyp_buffers.rx), ffa_page_count, @@ -174,7 +223,7 @@ static void ffa_mem_reclaim(struct arm_smccc_res *res, = u32 handle_lo, =20 static void ffa_retrieve_req(struct arm_smccc_res *res, u32 len) { - arm_smccc_1_1_smc(FFA_FN64_MEM_RETRIEVE_REQ, + arm_smccc_1_x_smc(FFA_FN64_MEM_RETRIEVE_REQ, len, len, 0, 0, 0, 0, 0, res); @@ -628,6 +677,20 @@ static bool ffa_call_supported(u64 func_id) case FFA_RXTX_MAP: case FFA_MEM_DONATE: case FFA_MEM_RETRIEVE_REQ: + /* Optional notification interfaces added in FF-A 1.1 */ + case FFA_NOTIFICATION_BITMAP_CREATE: + case FFA_NOTIFICATION_BITMAP_DESTROY: + case FFA_NOTIFICATION_BIND: + case FFA_NOTIFICATION_UNBIND: + 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 @@ -680,7 +743,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; @@ -861,6 +924,18 @@ bool kvm_host_ffa_handler(struct kvm_cpu_context *host= _ctxt, u32 func_id) return true; } =20 +u32 ffa_get_hypervisor_version(void) +{ + u32 version =3D 0; + + hyp_spin_lock(&version_lock); + if (has_version_negotiated) + version =3D hyp_ffa_version; + hyp_spin_unlock(&version_lock); + + return version; +} + int hyp_ffa_init(void *pages) { struct arm_smccc_res res; @@ -869,7 +944,7 @@ int hyp_ffa_init(void *pages) 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); + arm_smccc_1_1_smc(FFA_VERSION, FFA_VERSION_1_2, 0, 0, 0, 0, 0, 0, &res); if (res.a0 =3D=3D FFA_RET_NOT_SUPPORTED) return 0; =20 @@ -889,10 +964,11 @@ 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)) + /* See do_ffa_guest_version before bumping maximum supported version. */ + 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.49.0.1045.g170613ef41-goog