From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EDFB4C5AD49 for ; Mon, 26 May 2025 07:36:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=s3SYCP4Vpc50r+usm75P0pP1CHaDQViZ/53BeMI7PyQ=; b=j6TJDAItbKAumHdQZuVKWI7260 pMfJrt/M1qopcw5quea2mWgdIPWFd6oHQ0MVtWKNpdshOwmraIqd+QZHRFknXH1nVAwjd1unT/fAV eJ9x6OFhVVbcF7LhD3xLJ0k35V4CayTwvS+G9/zObEps/Atk1ctnh2QQyNbAGvuVGlmFKlI+5SMdz EuW7tLXIrHGQEgbkVDmuosFGgWhHDw262XqBGLDSYH/u/z09uBrjdJ18NOieszAYApBh3fAVMYgzy JIobPGBQ84aqo/sy4nwtegEx3rVrWXozYIlgh73quNM8/f6sRlB5GtxQxqpcbybivmWv3crsy/Cr8 UYVYV52A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uJSNP-00000008IQQ-3q2y; Mon, 26 May 2025 07:36:03 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uJSL3-00000008I85-3Ix5 for linux-arm-kernel@lists.infradead.org; Mon, 26 May 2025 07:33:39 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 36FCFA4E03C; Mon, 26 May 2025 07:33:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 532ADC4CEE7; Mon, 26 May 2025 07:33:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1748244815; bh=n06pjiR3hX6mJ2V6ci9WvZueX0ybWrSTpdyrRyQUxww=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=tlH4K3NlopK8NwFlAUzj3LDpVkIdJAYwYJ2MYUMGCqcetxLG7vnPmXJYBZWWyR51U j08tn++djKFXkX+3JQlQXy4tC5mtIX5OBiBeapxjNNajb3Gu6gfItSiOmZx4TPc1VH HDvZWb+lr8YvcXPJbFeCbeldXJUysGZN1dwpNxnpMuDqANvh1tPN6AptLgYEY2tjcg 19yOKh4mk6DgmFxXBW82XrZ/YEbHTCPAeKK81H9Wccz7gphhe+tMfYXTaZUym9CjFq HIfXhWz3NgQj7Nwb/2LoODSYMcmO7n1KqE85/+JsVs7xJOEOjxkK0f6Yi8B2EIDAAl 1swcErzoeYZLQ== Date: Mon, 26 May 2025 13:03:11 +0530 From: Sumit Garg To: Jens Wiklander Cc: 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, Olivier Masse , Thierry Reding , Yong Wu , Sumit Semwal , Benjamin Gaignard , Brian Starkey , John Stultz , "T . J . Mercier" , Christian =?iso-8859-1?Q?K=F6nig?= , Matthias Brugger , AngeloGioacchino Del Regno , azarrabi@qti.qualcomm.com, Simona Vetter , Daniel Stone , Rouven Czerwinski Subject: Re: [PATCH v9 7/9] optee: support protected memory allocation Message-ID: References: <20250520152436.474778-1-jens.wiklander@linaro.org> <20250520152436.474778-8-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250520152436.474778-8-jens.wiklander@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250526_003338_008889_C9B62559 X-CRM114-Status: GOOD ( 26.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, May 20, 2025 at 05:16:50PM +0200, Jens Wiklander wrote: > Add support in the OP-TEE backend driver for protected memory > allocation. The support is limited to only the SMC ABI and for secure > video buffers. > > OP-TEE is probed for the range of protected physical memory and a > memory pool allocator is initialized if OP-TEE have support for such > memory. > > Signed-off-by: Jens Wiklander > --- > drivers/tee/optee/core.c | 10 +++++++ > drivers/tee/optee/optee_private.h | 2 ++ > drivers/tee/optee/smc_abi.c | 45 +++++++++++++++++++++++++++++-- > 3 files changed, 55 insertions(+), 2 deletions(-) > > diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c > index c75fddc83576..4b14a7ac56f9 100644 > --- a/drivers/tee/optee/core.c > +++ b/drivers/tee/optee/core.c > @@ -56,6 +56,15 @@ int optee_rpmb_intf_rdev(struct notifier_block *intf, unsigned long action, > return 0; > } > > +int optee_set_dma_mask(struct optee *optee, u_int pa_width) > +{ > + u64 mask = DMA_BIT_MASK(min(64, pa_width)); > + > + optee->teedev->dev.dma_mask = &optee->teedev->dev.coherent_dma_mask; > + > + return dma_set_mask_and_coherent(&optee->teedev->dev, mask); > +} > + > static void optee_bus_scan(struct work_struct *work) > { > WARN_ON(optee_enumerate_devices(PTA_CMD_GET_DEVICES_SUPP)); > @@ -181,6 +190,7 @@ void optee_remove_common(struct optee *optee) > tee_device_unregister(optee->supp_teedev); > tee_device_unregister(optee->teedev); > > + tee_device_unregister_all_dma_heaps(optee->teedev); > tee_shm_pool_free(optee->pool); > optee_supp_uninit(&optee->supp); > mutex_destroy(&optee->call_queue.mutex); > diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h > index dc0f355ef72a..5e3c34802121 100644 > --- a/drivers/tee/optee/optee_private.h > +++ b/drivers/tee/optee/optee_private.h > @@ -272,6 +272,8 @@ struct optee_call_ctx { > > extern struct blocking_notifier_head optee_rpmb_intf_added; > > +int optee_set_dma_mask(struct optee *optee, u_int pa_width); > + > int optee_notif_init(struct optee *optee, u_int max_key); > void optee_notif_uninit(struct optee *optee); > int optee_notif_wait(struct optee *optee, u_int key, u32 timeout); > diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c > index f0c3ac1103bb..f3cae8243785 100644 > --- a/drivers/tee/optee/smc_abi.c > +++ b/drivers/tee/optee/smc_abi.c > @@ -1584,6 +1584,42 @@ static inline int optee_load_fw(struct platform_device *pdev, > } > #endif > > +static int optee_protmem_pool_init(struct optee *optee) > +{ > + enum tee_dma_heap_id heap_id = TEE_DMA_HEAP_SECURE_VIDEO_PLAY; > + struct tee_protmem_pool *pool; > + int rc; > + > + if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_PROTMEM) { > + union { > + struct arm_smccc_res smccc; > + struct optee_smc_get_protmem_config_result result; > + } res; > + > + optee->smc.invoke_fn(OPTEE_SMC_GET_PROTMEM_CONFIG, 0, 0, 0, 0, > + 0, 0, 0, &res.smccc); > + if (res.result.status != OPTEE_SMC_RETURN_OK) { > + pr_err("Secure Data Path service not available\n"); > + return 0; > + } > + rc = optee_set_dma_mask(optee, res.result.pa_width); > + if (!rc) > + pool = tee_protmem_static_pool_alloc(res.result.start, > + res.result.size); > + if (IS_ERR(pool)) > + return PTR_ERR(pool); > + > + rc = tee_device_register_dma_heap(optee->teedev, heap_id, pool); > + if (rc) > + goto err; > + } > + > + return 0; > +err: > + pool->ops->destroy_pool(pool); > + return rc; > +} > + > static int optee_probe(struct platform_device *pdev) > { > optee_invoke_fn *invoke_fn; > @@ -1679,7 +1715,7 @@ static int optee_probe(struct platform_device *pdev) > optee = kzalloc(sizeof(*optee), GFP_KERNEL); > if (!optee) { > rc = -ENOMEM; > - goto err_free_pool; > + goto err_free_shm_pool; > } > > optee->ops = &optee_ops; > @@ -1752,6 +1788,10 @@ static int optee_probe(struct platform_device *pdev) > pr_info("Asynchronous notifications enabled\n"); > } > > + rc = optee_protmem_pool_init(optee); Here we should do a Kconfig check for CONFIG_DMABUF_HEAPS so that we don't proceed any further with initialization. Rest looks good to me. -Sumit > + if (rc) > + goto err_notif_uninit; > + > /* > * Ensure that there are no pre-existing shm objects before enabling > * the shm cache so that there's no chance of receiving an invalid > @@ -1787,6 +1827,7 @@ static int optee_probe(struct platform_device *pdev) > optee_disable_shm_cache(optee); > optee_smc_notif_uninit_irq(optee); > optee_unregister_devices(); > + tee_device_unregister_all_dma_heaps(optee->teedev); > err_notif_uninit: > optee_notif_uninit(optee); > err_close_ctx: > @@ -1803,7 +1844,7 @@ static int optee_probe(struct platform_device *pdev) > tee_device_unregister(optee->teedev); > err_free_optee: > kfree(optee); > -err_free_pool: > +err_free_shm_pool: > tee_shm_pool_free(pool); > if (memremaped_shm) > memunmap(memremaped_shm); > -- > 2.43.0 >