From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74B292765C5 for ; Mon, 12 Jan 2026 09:55:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768211709; cv=none; b=ZEXhzCKwpheruvrSkU6c/UgjxwXwXvNkg3B8taaHt21rzDndN8GVpALNigTuuhKWwUDjs7puziLzXGz3jzyrFS5H/zFJPGNV18FpFK2NxWyMI/hX6ELfW48RigvhTxaVXdcfFbginR6ZgN60aAeTlHa3ku1aYDAwA2vkBvTg88k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768211709; c=relaxed/simple; bh=EYibWOfvYx9cSEX0ggchvENqoljH8vWkhaWRPpQXbss=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=NZ/IqIWx6a2fX6RtrxVW2Sh0xAVvCISvnVYfIqA9PC+kPbUbASGOhRA9j4yEwRHoU+Iye3ra+3LpaZi6d+rQPSDr1hMIvbI9r/N6+l1VDD5djtjjiuB1AA6G7TePv05lkWJo54f2WIdUHO4vabKd2K7qI2jogL39btTnKMSgDPE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=BU/XlNeS; arc=none smtp.client-ip=209.85.167.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="BU/XlNeS" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-59b72a1e2f0so5868041e87.0 for ; Mon, 12 Jan 2026 01:55:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768211706; x=1768816506; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=If/0F4Dgd4go54V02toMplYt72r7M7684FwIgzepZlg=; b=BU/XlNeSyln3fZpt7/jgLTrtQHdNNKmGeczhlj2GW/JM6mfEEEONtUP9ruoq8ESd9V wfJAdQ3dBAUPYoLEqGnEKMfDY9egHP0jvmi1P2vSmxafNMgQz40XTRpFER+KhV+BkI5u bHz7tkX+C2kewhvUGmJq9DIIH2wArTyNKKBB7M9Aamu/BVmKnEKSDmtmvcNE5OUdGBHE Cu4KV1OGrDHeIfLuEKwbEFYVtaq5OTUFy6QqdgF/dU7JcIKTWJ/NjZ1XFvwqWRm03z8f zbzQfH9Ky+ah712aWIgQNnFWW0shiFzk6uAXu1cpT9oKVs5W9+CA/2r9QzmsdKUtBzrv Jxow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768211706; x=1768816506; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=If/0F4Dgd4go54V02toMplYt72r7M7684FwIgzepZlg=; b=Irxf7MraK60oG2xi+Opxu5D5HZSneHJoztRu4bR7wj8cXuPoTVHi7LlWT0N+aeu8gm lHXOEJg4HvyIwi/R0uJszUP4d0Lqx0vhJWr12o7tyCG54t3Zt9bE3+DimZbNpjJ1esFP j+2p3UuJH/IzxqrmJvg2dQXpJtf1DuptDT0vrI/WSJwJ4pDti/xC4TZGmRUzylPdBzQd EItgB0uFXMBmwjQgrm6gVT45y8LC4AujR35yO9uUlqs1MllWIkp7HSoY+b2Ls4SDsk6I zGmcBGX0ARO9OR3nb9fCMdGDJgsA2BSOI4H75THLQ5hcz/3vfvZP4nOL18LMD9vEbsS2 ypXg== X-Gm-Message-State: AOJu0YxkpYovAGZcv6Nq+hY6M6qiAmWRJacTZKUVujiluJBKdYtWimQm O+Fvpub94gjy1+xRx4RXY7fSXp1luKrzNYDn6BZ9qCDIFshyv6BYQvAmCEZWloeUqx0= X-Gm-Gg: AY/fxX5vtb2rbwf2jP+k7P1Up2Lx3v6pWkCuBdQSvHV8iBwu8vjsP8qxGlxceRCb57a oVggsG/wP8IyEVhQg698v1fMmYDBE0LkZVNc+jAYvzhRCDjxffe/DdTBdWEU6yh8+BBUZ1f3Zqc 1K1mGDF7gtBz7i6uC9ku4RYEJYuz2rS2sCcRIrLORj77fc3qvZ7T3ejWIzeJwcXd+qWaT1bhaCZ IN1rkIryD+aHBZUxSdULYwuZ7MRxwC1KKnGoVykk7h4DVMgcPCKs/6u+8w/edCZFUx+pO9zB++K KFJzr+IEpW1XcX5KFAjVe4L9E0ovgSPk+bnatDKgAd31ZGkqegQDwGVOeoI1ckUMtHD/xojstjc jJsYeowpdF8HqcpRTaovMyjUS0wAgBO9B+R9ObpsmtSbuldst1zEsOl5Ur9e2m6DvulJtAIXEE4 deLhnEFTitCt2/GexvJoOo0rct6gNvfiF1AAfBgWTNF6cP2o/CMRZFT9LIYWydT3/fTecZPfbrN DD6mYg= X-Google-Smtp-Source: AGHT+IE/luQK6ZRZ24KHDfr++nGrZL/HCaks/LIfYd5i4OLAWSGOiXtxyw0tX0h7gVf9kbEkeI4nIQ== X-Received: by 2002:a05:6512:3ba6:b0:59b:8465:b44e with SMTP id 2adb3069b0e04-59b8465b640mr2372867e87.41.1768211705418; Mon, 12 Jan 2026 01:55:05 -0800 (PST) Received: from rayden (h-79-136-84-34.A175.priv.bahnhof.se. [79.136.84.34]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59b73132ff8sm3604441e87.70.2026.01.12.01.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 01:55:04 -0800 (PST) Date: Mon, 12 Jan 2026 10:55:03 +0100 From: Jens Wiklander To: Aristo Chen Cc: linux-kernel@vger.kernel.org, sumit.garg@kernel.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 v6 2/2] tee: optee: store OS revision for TEE core Message-ID: <20260112095503.GA2835866@rayden> References: <20260107152607.902735-1-aristo.chen@canonical.com> <20260108064517.13854-1-aristo.chen@canonical.com> <20260108064517.13854-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=utf-8 Content-Disposition: inline In-Reply-To: <20260108064517.13854-2-aristo.chen@canonical.com> On Thu, Jan 08, 2026 at 02:45:09PM +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 | 57 ++++++++++++++++++++++++------- > drivers/tee/optee/optee_private.h | 19 +++++++++++ > drivers/tee/optee/smc_abi.c | 15 ++++++-- > 4 files changed, 99 insertions(+), 15 deletions(-) Checkpatch complains with: CHECK: Alignment should match open parenthesis #62: FILE: drivers/tee/optee/ffa_abi.c:779: +static bool optee_ffa_get_os_revision(struct ffa_device *ffa_dev, + const struct ffa_ops *ops, CHECK: Alignment should match open parenthesis #142: FILE: drivers/tee/optee/ffa_abi.c:1091: + if (!optee_ffa_get_os_revision(ffa_dev, ffa_ops, &optee->revision, + false)) { WARNING: From:/Signed-off-by: email address mismatch: 'From: Aristo Chen ' != 'Signed-off-by: Aristo Chen ' total: 0 errors, 1 warnings, 2 checks, 199 lines checked Cheers, Jens > > 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..82dbed1c87e5 100644 > --- a/drivers/tee/optee/ffa_abi.c > +++ b/drivers/tee/optee/ffa_abi.c > @@ -775,6 +775,42 @@ static int optee_ffa_reclaim_protmem(struct optee *optee, > * with a matching configuration. > */ > > +static bool optee_ffa_get_os_revision(struct ffa_device *ffa_dev, > + const struct ffa_ops *ops, > + struct optee_revision *revision, > + bool log) > +{ > + const struct ffa_msg_ops *msg_ops = ops->msg_ops; > + struct ffa_send_direct_data data = { > + .data0 = OPTEE_FFA_GET_OS_VERSION, > + }; > + int rc; > + > + msg_ops->mode_32bit_set(ffa_dev); > + > + rc = msg_ops->sync_send_receive(ffa_dev, &data); > + if (rc) { > + 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 (log) { > + if (data.data2) > + pr_info("revision %lu.%lu (%08lx)", > + data.data0, data.data1, data.data2); > + else > + pr_info("revision %lu.%lu", data.data0, data.data1); > + } > + > + return true; > +} > + > static bool optee_ffa_api_is_compatible(struct ffa_device *ffa_dev, > const struct ffa_ops *ops) > { > @@ -798,19 +834,8 @@ static bool optee_ffa_api_is_compatible(struct ffa_device *ffa_dev, > return false; > } > > - data = (struct ffa_send_direct_data){ > - .data0 = OPTEE_FFA_GET_OS_VERSION, > - }; > - rc = msg_ops->sync_send_receive(ffa_dev, &data); > - if (rc) { > - pr_err("Unexpected error %d\n", rc); > + if (!optee_ffa_get_os_revision(ffa_dev, ops, NULL, true)) > return false; > - } > - if (data.data2) > - pr_info("revision %lu.%lu (%08lx)", > - data.data0, data.data1, data.data2); > - else > - pr_info("revision %lu.%lu", data.data0, data.data1); > > return true; > } > @@ -900,6 +925,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 +944,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, > @@ -1060,6 +1087,12 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) > if (!optee) > return -ENOMEM; > > + if (!optee_ffa_get_os_revision(ffa_dev, ffa_ops, &optee->revision, > + false)) { > + rc = -EINVAL; > + goto err_free_optee; > + } > + > pool = optee_ffa_shm_pool_alloc_pages(); > if (IS_ERR(pool)) { > rc = PTR_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..51fae1ab8ef8 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, > @@ -1745,8 +1754,6 @@ static int optee_probe(struct platform_device *pdev) > return -EINVAL; > } > > - optee_msg_get_os_revision(invoke_fn); > - > if (!optee_msg_api_revision_is_compatible(invoke_fn)) { > pr_warn("api revision mismatch\n"); > return -EINVAL; > @@ -1815,6 +1822,8 @@ static int optee_probe(struct platform_device *pdev) > goto err_free_shm_pool; > } > > + optee_msg_get_os_revision(invoke_fn, &optee->revision); > + > optee->ops = &optee_ops; > optee->smc.invoke_fn = invoke_fn; > optee->smc.sec_caps = sec_caps; > -- > 2.43.0 >