From mboxrd@z Thu Jan 1 00:00:00 1970 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 B31F0295DA6; Fri, 18 Jul 2025 13:45:24 +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=1752846324; cv=none; b=iohbK1lT/idf2B/s+2QFSbqDmzbV4uIZuqb7JawlFXq+frKXNsA4YfhWoD+m47VVECr3HKJ+FEDJzNVD4G8wg3Kl5RkX3Z8SNgL7CwUfg6NVGjgZZZLn51xVtM5cS+qAWj64YyQa+ynRyt1Oz9u6eddEPa8ZeXemyCaxBL81kCk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752846324; c=relaxed/simple; bh=lBP1tzJtVv+ELpkrm+Hxa6Vf6Oiw3IR0Q/iMkUJvCxs=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=QsPni4w+zy62Zl59fpoLveRcXpZoDMS416Bq4JjMN9YavQswO+WWVLjZH4LrmIXEZPWNxK/V6O6fyC9BgdB7wCt6TuIlUJkjhDZbi7dkNgjwdaJ39UEnghYgkbZW03n7+IwiQFWjqZ0pZOYpG4hUkEYnlFtvARe3ipn9qF4Eiho= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h6yFO+Qc; 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="h6yFO+Qc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27009C4CEEB; Fri, 18 Jul 2025 13:45:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752846324; bh=lBP1tzJtVv+ELpkrm+Hxa6Vf6Oiw3IR0Q/iMkUJvCxs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=h6yFO+QciUODNeNc6oLaPSievka/COZ7FjdiqWTRSHbwajP52I4qTSihh2m4CKxWl 8SA2w9m2zLbgsQ/Bv/FY8avM/ZRklvj+spKlpRArQiSDx60NWHu8vc4ackmEf02XXg tbmDZ4WPmE/nkZPceSTCKapGZutcdmi3PG1k0e/fDC/OWdrQhEtmv+PJlG73M1J+oi wXOOahvXEq3dEdOeMxV8Pq4qXbqmOfAseOAvciovHfDkWucQZgL9HZP04sVsluJ6wl cLxBGMyOIjqAAxjqzlvPafBuDWNHUIBMedJczxZ9HgycszXhOOK9m9SOIdDAVUO3K9 mH8eEr0svb//g== Date: Fri, 18 Jul 2025 14:45:17 +0100 From: Will Deacon To: perlarsen@google.com Cc: Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Sudeep Holla , 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 Subject: Re: [PATCH v7 4/5] KVM: arm64: Bump the supported version of FF-A to 1.2 Message-ID: References: <20250701-virtio-msg-ffa-v7-0-995afc3d385e@google.com> <20250701-virtio-msg-ffa-v7-4-995afc3d385e@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250701-virtio-msg-ffa-v7-4-995afc3d385e@google.com> On Tue, Jul 01, 2025 at 10:06:37PM +0000, Per Larsen via B4 Relay wrote: > 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 | 18 ++++++++++++++---- > include/linux/arm_ffa.h | 1 + > 2 files changed, 15 insertions(+), 4 deletions(-) This patch needs to be split into smaller chunks as it's doing a number of things in one go. > diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c > index 5fd6474d96ae4b90d99796ee81bb36373219afc4..79d834120a3f3d26e17e9170c60012b60c6f5a5e 100644 > --- a/arch/arm64/kvm/hyp/nvhe/ffa.c > +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c > @@ -678,6 +678,13 @@ static bool ffa_call_supported(u64 func_id) > case FFA_NOTIFICATION_SET: > case FFA_NOTIFICATION_GET: > case FFA_NOTIFICATION_INFO_GET: > + /* Optional interfaces added in FF-A 1.2 */ > + case FFA_MSG_SEND_DIRECT_REQ2: /* Optional per 7.5.1 */ > + case FFA_MSG_SEND_DIRECT_RESP2: /* Optional per 7.5.1 */ > + case FFA_CONSOLE_LOG: /* Optional per 13.1: not in Table 13.1 */ > + case FFA_PARTITION_INFO_GET_REGS: /* Optional for virtual instances per 13.1 */ > + /* Unsupported interfaces added in FF-A 1.2 */ > + case FFA_EL3_INTR_HANDLE: /* Only valid for secure physical instances */ > return false; > } This could be a standalone change ^^^ > > @@ -734,7 +741,10 @@ static int hyp_ffa_post_init(void) > if (res.a0 != FFA_SUCCESS) > return -EOPNOTSUPP; > > - switch (res.a2) { > + if ((res.a2 & GENMASK(15, 2)) != 0 || res.a3 != 0) > + return -EINVAL; Why are you checking bits a2[15:2] and a3? The spec says they MBZ, so we shouldn't care about enforcing that. In fact, adding the check probably means we'll fail if those bits get allocated in future. > + > + switch (res.a2 & FFA_FEAT_RXTX_MIN_SZ_MASK) { That makes sense, and can be its own patch. > case FFA_FEAT_RXTX_MIN_SZ_4K: > min_rxtx_sz = SZ_4K; > break; > @@ -931,7 +941,7 @@ int hyp_ffa_init(void *pages) > > arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { > .a0 = FFA_VERSION, > - .a1 = FFA_VERSION_1_1, > + .a1 = FFA_VERSION_1_2, > > }, &res); > if (res.a0 == FFA_RET_NOT_SUPPORTED) > return 0; > @@ -952,10 +962,10 @@ int hyp_ffa_init(void *pages) > if (FFA_MAJOR_VERSION(res.a0) != 1) > return -EOPNOTSUPP; > > - 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 = res.a0; > else > - hyp_ffa_version = FFA_VERSION_1_1; > + hyp_ffa_version = FFA_VERSION_1_2; The move to v1.2 can also be its own patch. So you end up with three in total. Will