mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jens Wiklander <jens.wiklander@linaro.org>
To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
	dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org,
	op-tee@lists.trustedfirmware.org,
	linux-arm-kernel@lists.infradead.org
Cc: "Olivier Masse" <olivier.masse@nxp.com>,
	"Thierry Reding" <thierry.reding@gmail.com>,
	"Yong Wu" <yong.wu@mediatek.com>,
	"Sumit Semwal" <sumit.semwal@linaro.org>,
	"Benjamin Gaignard" <benjamin.gaignard@collabora.com>,
	"Brian Starkey" <Brian.Starkey@arm.com>,
	"John Stultz" <jstultz@google.com>,
	"T . J . Mercier" <tjmercier@google.com>,
	"Christian König" <christian.koenig@amd.com>,
	"Sumit Garg" <sumit.garg@kernel.org>,
	"Matthias Brugger" <matthias.bgg@gmail.com>,
	"AngeloGioacchino Del Regno"
	<angelogioacchino.delregno@collabora.com>,
	azarrabi@qti.qualcomm.com,
	"Simona Vetter" <simona.vetter@ffwll.ch>,
	"Daniel Stone" <daniel@fooishbar.org>,
	"Rouven Czerwinski" <rouven.czerwinski@linaro.org>,
	"Jens Wiklander" <jens.wiklander@linaro.org>
Subject: [PATCH v8 02/14] optee: pass parent device to tee_device_alloc()
Date: Fri,  2 May 2025 11:59:16 +0200	[thread overview]
Message-ID: <20250502100049.1746335-3-jens.wiklander@linaro.org> (raw)
In-Reply-To: <20250502100049.1746335-1-jens.wiklander@linaro.org>

During probing of the OP-TEE driver, pass the parent device to
tee_device_alloc() so the dma_mask of the new devices can be updated
accordingly.

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Sumit Garg <sumit.garg@kernel.org>
---
 drivers/tee/optee/ffa_abi.c | 8 ++++----
 drivers/tee/optee/smc_abi.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
index f3af5666bb11..4ca1d5161b82 100644
--- a/drivers/tee/optee/ffa_abi.c
+++ b/drivers/tee/optee/ffa_abi.c
@@ -914,16 +914,16 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
 	    (sec_caps & OPTEE_FFA_SEC_CAP_RPMB_PROBE))
 		optee->in_kernel_rpmb_routing = true;
 
-	teedev = tee_device_alloc(&optee_ffa_clnt_desc, NULL, optee->pool,
-				  optee);
+	teedev = tee_device_alloc(&optee_ffa_clnt_desc, &ffa_dev->dev,
+				  optee->pool, optee);
 	if (IS_ERR(teedev)) {
 		rc = PTR_ERR(teedev);
 		goto err_free_pool;
 	}
 	optee->teedev = teedev;
 
-	teedev = tee_device_alloc(&optee_ffa_supp_desc, NULL, optee->pool,
-				  optee);
+	teedev = tee_device_alloc(&optee_ffa_supp_desc, &ffa_dev->dev,
+				  optee->pool, optee);
 	if (IS_ERR(teedev)) {
 		rc = PTR_ERR(teedev);
 		goto err_unreg_teedev;
diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index f0c3ac1103bb..165fadd9abc9 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -1691,14 +1691,14 @@ static int optee_probe(struct platform_device *pdev)
 	    (sec_caps & OPTEE_SMC_SEC_CAP_RPMB_PROBE))
 		optee->in_kernel_rpmb_routing = true;
 
-	teedev = tee_device_alloc(&optee_clnt_desc, NULL, pool, optee);
+	teedev = tee_device_alloc(&optee_clnt_desc, &pdev->dev, pool, optee);
 	if (IS_ERR(teedev)) {
 		rc = PTR_ERR(teedev);
 		goto err_free_optee;
 	}
 	optee->teedev = teedev;
 
-	teedev = tee_device_alloc(&optee_supp_desc, NULL, pool, optee);
+	teedev = tee_device_alloc(&optee_supp_desc, &pdev->dev, pool, optee);
 	if (IS_ERR(teedev)) {
 		rc = PTR_ERR(teedev);
 		goto err_unreg_teedev;
-- 
2.43.0


  parent reply	other threads:[~2025-05-02 10:00 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-02  9:59 [PATCH v8 00/14] TEE subsystem for protected dma-buf allocations Jens Wiklander
2025-05-02  9:59 ` [PATCH v8 01/14] tee: tee_device_alloc(): copy dma_mask from parent device Jens Wiklander
2025-05-02 13:36   ` Robin Murphy
2025-05-05 12:10     ` Jens Wiklander
2025-05-02  9:59 ` Jens Wiklander [this message]
2025-05-02  9:59 ` [PATCH v8 03/14] optee: account for direction while converting parameters Jens Wiklander
2025-05-07 12:42   ` Sumit Garg
2025-05-07 13:07     ` Jens Wiklander
2025-05-02  9:59 ` [PATCH v8 04/14] optee: sync secure world ABI headers Jens Wiklander
2025-05-02  9:59 ` [PATCH v8 05/14] dma-buf: dma-heap: export declared functions Jens Wiklander
2025-05-02  9:59 ` [PATCH v8 06/14] tee: implement protected DMA-heap Jens Wiklander
2025-05-02 13:59   ` Robin Murphy
2025-05-06  6:50     ` Jens Wiklander
2025-05-02  9:59 ` [PATCH v8 07/14] tee: refactor params_from_user() Jens Wiklander
2025-05-07 12:53   ` Sumit Garg
2025-05-02  9:59 ` [PATCH v8 08/14] tee: new ioctl to a register tee_shm from a dmabuf file descriptor Jens Wiklander
2025-05-02  9:59 ` [PATCH v8 09/14] cma: export cma_alloc() and cma_release() Jens Wiklander
2025-05-02 15:49   ` Matthew Wilcox
2025-05-05 11:38     ` Jens Wiklander
2025-05-02  9:59 ` [PATCH v8 10/14] dma-contiguous: export dma_contiguous_default_area Jens Wiklander
2025-05-02 13:11   ` Robin Murphy
2025-05-05 10:00     ` Jens Wiklander
2025-05-02  9:59 ` [PATCH v8 11/14] tee: add tee_shm_alloc_cma_phys_mem() Jens Wiklander
2025-05-02 15:11   ` Robin Murphy
2025-05-07 16:32     ` Jens Wiklander
2025-05-02  9:59 ` [PATCH v8 12/14] optee: support protected memory allocation Jens Wiklander
2025-05-02  9:59 ` [PATCH v8 13/14] optee: FF-A: dynamic " Jens Wiklander
2025-05-02  9:59 ` [PATCH v8 14/14] optee: smc abi: " Jens Wiklander

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250502100049.1746335-3-jens.wiklander@linaro.org \
    --to=jens.wiklander@linaro.org \
    --cc=Brian.Starkey@arm.com \
    --cc=angelogioacchino.delregno@collabora.com \
    --cc=azarrabi@qti.qualcomm.com \
    --cc=benjamin.gaignard@collabora.com \
    --cc=christian.koenig@amd.com \
    --cc=daniel@fooishbar.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=jstultz@google.com \
    --cc=linaro-mm-sig@lists.linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=matthias.bgg@gmail.com \
    --cc=olivier.masse@nxp.com \
    --cc=op-tee@lists.trustedfirmware.org \
    --cc=rouven.czerwinski@linaro.org \
    --cc=simona.vetter@ffwll.ch \
    --cc=sumit.garg@kernel.org \
    --cc=sumit.semwal@linaro.org \
    --cc=thierry.reding@gmail.com \
    --cc=tjmercier@google.com \
    --cc=yong.wu@mediatek.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®