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 F32FD328632 for ; Mon, 5 Jan 2026 05:20:34 +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=1767590435; cv=none; b=kADJH498tR3Hq836/7bcXPpJesZmuNflrcgqj23V9Dy9u+AM72yFsi1fCf5D6g8ODRMN2h1R24R+FtvA5zTYwF18qyozfgQDMn8u6hoEHJH9U0FZxQ/bDFETeXyVcVloqMHX5GiaSgNWEJ+BYesEaAZ2IhTw+yvyVlzPUpm+S4c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767590435; c=relaxed/simple; bh=MGWLyAzs3XL3xB15xnwOevvpI3yV67UdzZWSsRLo94A=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=mTrLEdsga8OkUMFwEZJbzHHHErxo+ioMnPk/70WA/m6ncaae1Pn+yBrGrp62JdUIydYWf2h+qWJIKrxvMxjkDSRiwSOACjMiwYKk5B7x80oUhyu+KeCYImAzUDixjwyWokGSfqY4lFTOE7sLbrtPatQtcN3ypV6tQ6abBzktfZc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KQTZPfqk; 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="KQTZPfqk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B16FEC116D0; Mon, 5 Jan 2026 05:20:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767590434; bh=MGWLyAzs3XL3xB15xnwOevvpI3yV67UdzZWSsRLo94A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=KQTZPfqkV8kXp664t412s+AwbTU1CQIHqYCRTkw7SA1q1VpHTr0EjJTzTlTQKlOnM OgREDde8omq+8U2GWsmRV+/bW6b0lEZxu8GVt8W3+6Pqr12wVTIG3oNTqtVDCq7O5F Xm9xTBmBhbBO7ndtzNH0VXWyVdBCaLg5S5HcAB6vTdAbcPLg287NpwZLh+Nk5HaSVo SFxqkS/qdCyLhIx4keuaxWjEE351Wivng61kKL7FpkaEDvW0AsNlyHBGSfAtAN8nLz MW/DS5O9YxBITsKpFlXbrahCMwe0TN72SpXvRWPnwZZrBeRPq08w5oRz4wNeHA1N0M fC+3/rPCeEosw== Date: Mon, 5 Jan 2026 10:50:28 +0530 From: Sumit Garg To: Aristo Chen Cc: linux-kernel@vger.kernel.org, jens.wiklander@linaro.org, op-tee@lists.trustedfirmware.org, harshal.dev@oss.qualcomm.com, mario.limonciello@amd.com, Rijo-john.Thomas@amd.com, amirreza.zarrabi@oss.qualcomm.com, Aristo Chen Subject: Re: [PATCH v4 2/2] tee: optee: store OS revision for TEE core Message-ID: References: <20251226131920.64582-1-aristo.chen@canonical.com> <20251230051804.6230-1-aristo.chen@canonical.com> <20251230051804.6230-2-aristo.chen@canonical.com> 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=us-ascii Content-Disposition: inline In-Reply-To: <20251230051804.6230-2-aristo.chen@canonical.com> On Tue, Dec 30, 2025 at 01:17:59PM +0800, Aristo Chen wrote: > Collect OP-TEE OS revision from secure world for both SMC and FF-A ABIs, > store it in the OP-TEE driver, and expose it through the generic > get_tee_revision() callback. > > Signed-off-by: Aristo Chen > --- > drivers/tee/optee/core.c | 23 +++++++++++++++++++++++ > drivers/tee/optee/ffa_abi.c | 14 ++++++++++++-- > drivers/tee/optee/optee_private.h | 19 +++++++++++++++++++ > drivers/tee/optee/smc_abi.c | 15 +++++++++++++-- > 4 files changed, 67 insertions(+), 4 deletions(-) > > diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c > index 5b62139714ce..2d807bc748bc 100644 > --- a/drivers/tee/optee/core.c > +++ b/drivers/tee/optee/core.c > @@ -63,6 +63,29 @@ int optee_set_dma_mask(struct optee *optee, u_int pa_width) > return dma_coerce_mask_and_coherent(&optee->teedev->dev, mask); > } > > +int optee_get_revision(struct tee_device *teedev, char *buf, size_t len) > +{ > + struct optee *optee = tee_get_drvdata(teedev); > + u64 build_id; > + > + if (!optee) > + return -ENODEV; > + if (!buf || !len) > + return -EINVAL; > + > + build_id = optee->revision.os_build_id; > + if (build_id) > + scnprintf(buf, len, "%u.%u (%016llx)", > + optee->revision.os_major, > + optee->revision.os_minor, > + (unsigned long long)build_id); > + else > + scnprintf(buf, len, "%u.%u", optee->revision.os_major, > + optee->revision.os_minor); > + > + return 0; > +} > + > static void optee_bus_scan(struct work_struct *work) > { > WARN_ON(optee_enumerate_devices(PTA_CMD_GET_DEVICES_SUPP)); > diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c > index bf8390789ecf..d67ca1ec9506 100644 > --- a/drivers/tee/optee/ffa_abi.c > +++ b/drivers/tee/optee/ffa_abi.c > @@ -776,7 +776,8 @@ static int optee_ffa_reclaim_protmem(struct optee *optee, > */ > > static bool optee_ffa_api_is_compatible(struct ffa_device *ffa_dev, > - const struct ffa_ops *ops) > + const struct ffa_ops *ops, > + struct optee_revision *revision) > { > const struct ffa_msg_ops *msg_ops = ops->msg_ops; > struct ffa_send_direct_data data = { > @@ -806,6 +807,11 @@ static bool optee_ffa_api_is_compatible(struct ffa_device *ffa_dev, > pr_err("Unexpected error %d\n", rc); > return false; > } > + if (revision) { > + revision->os_major = data.data0; > + revision->os_minor = data.data1; > + revision->os_build_id = data.data2; > + } > if (data.data2) > pr_info("revision %lu.%lu (%08lx)", > data.data0, data.data1, data.data2); > @@ -900,6 +906,7 @@ static int optee_ffa_open(struct tee_context *ctx) > > static const struct tee_driver_ops optee_ffa_clnt_ops = { > .get_version = optee_ffa_get_version, > + .get_tee_revision = optee_get_revision, > .open = optee_ffa_open, > .release = optee_release, > .open_session = optee_open_session, > @@ -918,6 +925,7 @@ static const struct tee_desc optee_ffa_clnt_desc = { > > static const struct tee_driver_ops optee_ffa_supp_ops = { > .get_version = optee_ffa_get_version, > + .get_tee_revision = optee_get_revision, > .open = optee_ffa_open, > .release = optee_release_supp, > .supp_recv = optee_supp_recv, > @@ -1034,6 +1042,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) > { > const struct ffa_notifier_ops *notif_ops; > const struct ffa_ops *ffa_ops; > + struct optee_revision revision = { }; No need for this redundant variable on stack when... > unsigned int max_notif_value; > unsigned int rpc_param_count; > struct tee_shm_pool *pool; > @@ -1047,7 +1056,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) > ffa_ops = ffa_dev->ops; > notif_ops = ffa_ops->notifier_ops; > > - if (!optee_ffa_api_is_compatible(ffa_dev, ffa_ops)) > + if (!optee_ffa_api_is_compatible(ffa_dev, ffa_ops, &revision)) ...you can just invoke this API as rather: if (!optee_ffa_api_is_compatible(ffa_dev, ffa_ops, &optee->revision)) > return -EINVAL; > > if (!optee_ffa_exchange_caps(ffa_dev, ffa_ops, &sec_caps, > @@ -1059,6 +1068,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) > optee = kzalloc(sizeof(*optee), GFP_KERNEL); > if (!optee) > return -ENOMEM; > + optee->revision = revision; > > pool = optee_ffa_shm_pool_alloc_pages(); > if (IS_ERR(pool)) { > diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h > index db9ea673fbca..acd3051c4879 100644 > --- a/drivers/tee/optee/optee_private.h > +++ b/drivers/tee/optee/optee_private.h > @@ -171,6 +171,24 @@ struct optee_ffa { > > struct optee; > > +/** > + * struct optee_revision - OP-TEE OS revision reported by secure world > + * @os_major: OP-TEE OS major version > + * @os_minor: OP-TEE OS minor version > + * @os_build_id: OP-TEE OS build identifier (0 if unspecified) > + * > + * Values come from OPTEE_SMC_CALL_GET_OS_REVISION (SMC ABI) or > + * OPTEE_FFA_GET_OS_VERSION (FF-A ABI); this is the trusted OS revision, not an > + * FF-A ABI version. > + */ > +struct optee_revision { > + u32 os_major; > + u32 os_minor; > + u64 os_build_id; > +}; > + > +int optee_get_revision(struct tee_device *teedev, char *buf, size_t len); > + > /** > * struct optee_ops - OP-TEE driver internal operations > * @do_call_with_arg: enters OP-TEE in secure world > @@ -249,6 +267,7 @@ struct optee { > bool in_kernel_rpmb_routing; > struct work_struct scan_bus_work; > struct work_struct rpmb_scan_bus_work; > + struct optee_revision revision; > }; > > struct optee_session { > diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c > index 0be663fcd52b..0baaf7986a35 100644 > --- a/drivers/tee/optee/smc_abi.c > +++ b/drivers/tee/optee/smc_abi.c > @@ -1242,6 +1242,7 @@ static int optee_smc_open(struct tee_context *ctx) > > static const struct tee_driver_ops optee_clnt_ops = { > .get_version = optee_get_version, > + .get_tee_revision = optee_get_revision, > .open = optee_smc_open, > .release = optee_release, > .open_session = optee_open_session, > @@ -1261,6 +1262,7 @@ static const struct tee_desc optee_clnt_desc = { > > static const struct tee_driver_ops optee_supp_ops = { > .get_version = optee_get_version, > + .get_tee_revision = optee_get_revision, > .open = optee_smc_open, > .release = optee_release_supp, > .supp_recv = optee_supp_recv, > @@ -1323,7 +1325,8 @@ static bool optee_msg_api_uid_is_optee_image_load(optee_invoke_fn *invoke_fn) > } > #endif > > -static void optee_msg_get_os_revision(optee_invoke_fn *invoke_fn) > +static void optee_msg_get_os_revision(optee_invoke_fn *invoke_fn, > + struct optee_revision *revision) > { > union { > struct arm_smccc_res smccc; > @@ -1337,6 +1340,12 @@ static void optee_msg_get_os_revision(optee_invoke_fn *invoke_fn) > invoke_fn(OPTEE_SMC_CALL_GET_OS_REVISION, 0, 0, 0, 0, 0, 0, 0, > &res.smccc); > > + if (revision) { > + revision->os_major = res.result.major; > + revision->os_minor = res.result.minor; > + revision->os_build_id = res.result.build_id; > + } > + > if (res.result.build_id) > pr_info("revision %lu.%lu (%0*lx)", res.result.major, > res.result.minor, (int)sizeof(res.result.build_id) * 2, > @@ -1727,6 +1736,7 @@ static int optee_probe(struct platform_device *pdev) > unsigned int thread_count; > struct tee_device *teedev; > struct tee_context *ctx; > + struct optee_revision revision = { }; Ditto here. -Sumit > u32 max_notif_value; > u32 arg_cache_flags; > u32 sec_caps; > @@ -1745,7 +1755,7 @@ static int optee_probe(struct platform_device *pdev) > return -EINVAL; > } > > - optee_msg_get_os_revision(invoke_fn); > + optee_msg_get_os_revision(invoke_fn, &revision); > > if (!optee_msg_api_revision_is_compatible(invoke_fn)) { > pr_warn("api revision mismatch\n"); > @@ -1837,6 +1847,7 @@ static int optee_probe(struct platform_device *pdev) > goto err_unreg_teedev; > } > optee->supp_teedev = teedev; > + optee->revision = revision; > > optee_set_dev_group(optee); > > -- > 2.43.0 >