From: Yunfei Dong <yunfei.dong@mediatek.com>
To: "Jeffrey Kardatzke" <jkardatzke@google.com>,
"Nícolas F . R . A . Prado" <nfraprado@collabora.com>,
"Nathan Hebert" <nhebert@chromium.org>,
"Nicolas Dufresne" <nicolas.dufresne@collabora.com>,
"Hans Verkuil" <hverkuil-cisco@xs4all.nl>,
"AngeloGioacchino Del Regno"
<angelogioacchino.delregno@collabora.com>,
"Benjamin Gaignard" <benjamin.gaignard@collabora.com>,
"Sebastian Fricke" <sebastian.fricke@collabora.com>,
"Tomasz Figa" <tfiga@chromium.org>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>,
"Marek Szyprowski" <m.szyprowski@samsung.com>
Cc: "Chen-Yu Tsai" <wenst@chromium.org>,
"Yong Wu" <yong.wu@mediatek.com>,
"Hsin-Yi Wang" <hsinyi@chromium.org>,
"Fritz Koenig" <frkoenig@chromium.org>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Steve Cho" <stevecho@chromium.org>,
"Yunfei Dong" <yunfei.dong@mediatek.com>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Brian Starkey" <Brian.Starkey@arm.com>,
"John Stultz" <jstultz@google.com>,
"T . J . Mercier" <tjmercier@google.com>,
"Christian König" <christian.koenig@amd.com>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org,
Project_Global_Chrome_Upstream_Group@mediatek.com
Subject: [PATCH v7 09/28] media: mediatek: vcodec: allocate tee share memory
Date: Sat, 20 Jul 2024 15:15:47 +0800 [thread overview]
Message-ID: <20240720071606.27930-10-yunfei.dong@mediatek.com> (raw)
In-Reply-To: <20240720071606.27930-1-yunfei.dong@mediatek.com>
Allocate two share memory for each lat and core hardware used to share
information with optee-os. Msg buffer used to send ipi command and get ack
command with optee-os, data buffer used to store vsi information which
used for hardware decode.
Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
---
.../vcodec/decoder/mtk_vcodec_dec_optee.c | 77 ++++++++++++++++++-
.../vcodec/decoder/mtk_vcodec_dec_optee.h | 32 ++++++++
2 files changed, 108 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_optee.c b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_optee.c
index 6fce32f9ba18..bcef86f54d84 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_optee.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_optee.c
@@ -44,13 +44,66 @@ int mtk_vcodec_dec_optee_private_init(struct mtk_vcodec_dec_dev *vcodec_dev)
}
EXPORT_SYMBOL_GPL(mtk_vcodec_dec_optee_private_init);
+static void mtk_vcodec_dec_optee_deinit_memref(struct mtk_vdec_optee_ca_info *ca_info,
+ enum mtk_vdec_optee_data_index data_index)
+{
+ tee_shm_free(ca_info->shm_memref[data_index].msg_shm);
+}
+
+static int mtk_vcodec_dec_optee_init_memref(struct tee_context *tee_vdec_ctx,
+ struct mtk_vdec_optee_ca_info *ca_info,
+ enum mtk_vdec_optee_data_index data_index)
+{
+ struct mtk_vdec_optee_shm_memref *shm_memref;
+ int alloc_size = 0;
+ u64 shm_param_type = 0;
+ bool copy_buffer;
+
+ switch (data_index) {
+ case OPTEE_MSG_INDEX:
+ shm_param_type = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT;
+ alloc_size = MTK_VDEC_OPTEE_MSG_SIZE;
+ copy_buffer = true;
+ break;
+ case OPTEE_DATA_INDEX:
+ shm_param_type = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT;
+ alloc_size = MTK_VDEC_OPTEE_HW_SIZE;
+ copy_buffer = false;
+ break;
+ default:
+ pr_err(MTK_DBG_VCODEC_STR "tee invalid data_index: %d.\n", data_index);
+ return -EINVAL;
+ }
+
+ shm_memref = &ca_info->shm_memref[data_index];
+
+ /* Allocate dynamic shared memory with decoder TA */
+ shm_memref->msg_shm_size = alloc_size;
+ shm_memref->param_type = shm_param_type;
+ shm_memref->copy_to_ta = copy_buffer;
+ shm_memref->msg_shm = tee_shm_alloc_kernel_buf(tee_vdec_ctx, shm_memref->msg_shm_size);
+ if (IS_ERR(shm_memref->msg_shm)) {
+ pr_err(MTK_DBG_VCODEC_STR "tee alloc buf fail: data_index:%d.\n", data_index);
+ return -ENOMEM;
+ }
+
+ shm_memref->msg_shm_ca_buf = tee_shm_get_va(shm_memref->msg_shm, 0);
+ if (IS_ERR(shm_memref->msg_shm_ca_buf)) {
+ pr_err(MTK_DBG_VCODEC_STR "tee get shm va fail: data_index:%d.\n", data_index);
+ tee_shm_free(shm_memref->msg_shm);
+ return PTR_ERR(shm_memref->msg_shm_ca_buf);
+ }
+
+ return 0;
+}
+
static int mtk_vcodec_dec_optee_init_hw_info(struct mtk_vdec_optee_private *optee_private,
enum mtk_vdec_hw_id hardware_index)
{
struct device *dev = &optee_private->vcodec_dev->plat_dev->dev;
struct tee_ioctl_open_session_arg session_arg;
struct mtk_vdec_optee_ca_info *ca_info;
- int err = 0, session_func;
+ int err, i, session_func;
/* Open lat and core session with vdec TA. */
switch (hardware_index) {
@@ -84,6 +137,24 @@ static int mtk_vcodec_dec_optee_init_hw_info(struct mtk_vdec_optee_private *opte
dev_dbg(dev, MTK_DBG_VCODEC_STR "open vdec tee session hw_id:%d session_id=%x.\n",
hardware_index, ca_info->vdec_session_id);
+ /* Allocate dynamic shared memory with decoder TA */
+ for (i = 0; i < OPTEE_MAX_INDEX; i++) {
+ err = mtk_vcodec_dec_optee_init_memref(optee_private->tee_vdec_ctx, ca_info, i);
+ if (err) {
+ dev_err(dev, MTK_DBG_VCODEC_STR "init vdec memref failed: %d.\n", i);
+ goto err_init_memref;
+ }
+ }
+
+ return err;
+
+err_init_memref:
+ --i;
+ while (i >= 0)
+ mtk_vcodec_dec_optee_deinit_memref(ca_info, i--);
+
+ tee_client_close_session(optee_private->tee_vdec_ctx, ca_info->vdec_session_id);
+
return err;
}
@@ -91,12 +162,16 @@ static void mtk_vcodec_dec_optee_deinit_hw_info(struct mtk_vdec_optee_private *o
enum mtk_vdec_hw_id hw_id)
{
struct mtk_vdec_optee_ca_info *ca_info;
+ int i;
if (hw_id == MTK_VDEC_LAT0)
ca_info = &optee_private->lat_ca;
else
ca_info = &optee_private->core_ca;
+ for (i = 0; i < OPTEE_MAX_INDEX; i++)
+ mtk_vcodec_dec_optee_deinit_memref(ca_info, i);
+
tee_client_close_session(optee_private->tee_vdec_ctx, ca_info->vdec_session_id);
}
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_optee.h b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_optee.h
index 8a2a82874597..271545a864d3 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_optee.h
+++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_optee.h
@@ -18,16 +18,48 @@
#define MTK_OPTEE_MAX_TEE_PARAMS 4
+#define MTK_VDEC_OPTEE_MSG_SIZE 128
+#define MTK_VDEC_OPTEE_HW_SIZE (8 * SZ_1K)
+
+/**
+ * struct mtk_vdec_optee_shm_memref - shared memory reference params
+ * @msg_shm: message shared with TA in TEE.
+ * @msg_shm_ca_buf: ca buffer.
+ *
+ * @msg_shm_size: shared message size.
+ * @param_type: each tee param types.
+ * @copy_to_ta: need to copy data from ca to share memory.
+ */
+struct mtk_vdec_optee_shm_memref {
+ struct tee_shm *msg_shm;
+ u8 *msg_shm_ca_buf;
+
+ u32 msg_shm_size;
+ u64 param_type;
+ bool copy_to_ta;
+};
+
/**
* struct mtk_vdec_optee_ca_info - ca related param
* @vdec_session_id: optee TA session identifier.
* @hw_id: hardware index.
* @vdec_session_func: trusted application function id used specific to the TA.
+ * @shm_memref: shared memory reference params.
*/
struct mtk_vdec_optee_ca_info {
u32 vdec_session_id;
enum mtk_vdec_hw_id hw_id;
u32 vdec_session_func;
+ struct mtk_vdec_optee_shm_memref shm_memref[MTK_OPTEE_MAX_TEE_PARAMS];
+};
+
+/*
+ * enum mtk_vdec_optee_data_index - used to indentify each shared memory information
+ */
+enum mtk_vdec_optee_data_index {
+ OPTEE_MSG_INDEX = 0,
+ OPTEE_DATA_INDEX,
+ OPTEE_MAX_INDEX,
};
/**
--
2.18.0
next prev parent reply other threads:[~2024-07-20 7:26 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-20 7:15 [PATCH v7 00/28] media: mediatek: add driver to support secure video decoder Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 01/28] v4l2: add restricted memory flags Yunfei Dong
2024-07-20 9:13 ` Hans Verkuil
2024-07-20 7:15 ` [PATCH v7 02/28] v4l2: handle restricted memory flags in queue setup Yunfei Dong
2024-07-20 9:20 ` Hans Verkuil
2024-07-20 9:53 ` Hans Verkuil
2024-07-20 7:15 ` [PATCH v7 03/28] media: videobuf2: calculate restricted memory size Yunfei Dong
2024-07-20 9:29 ` Hans Verkuil
2024-07-20 7:15 ` [PATCH v7 04/28] dma-buf: heaps: Deduplicate docs and adopt common format Yunfei Dong
2024-07-25 11:52 ` Christian König
2024-07-25 18:28 ` T.J. Mercier
2024-07-20 7:15 ` [PATCH v7 05/28] dma-heap: Add proper kref handling on dma-buf heaps Yunfei Dong
2024-07-20 15:13 ` Markus Elfring
2024-07-22 18:06 ` John Stultz
2024-07-22 18:38 ` Markus Elfring
2024-07-20 7:15 ` [PATCH v7 06/28] dma-heap: Provide accessors so that in-kernel drivers can allocate dmabufs from specific heaps Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 07/28] media: mediatek: vcodec: add tee client interface to communiate with optee-os Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 08/28] media: mediatek: vcodec: build decoder OPTEE driver as module Yunfei Dong
2024-07-20 7:15 ` Yunfei Dong [this message]
2024-07-20 7:15 ` [PATCH v7 10/28] media: mediatek: vcodec: send share memory data to optee Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 11/28] media: mediatek: vcodec: initialize msg and vsi information Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 12/28] media: mediatek: vcodec: add interface to allocate/free secure memory Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 13/28] media: mediatek: vcodec: using shared memory as vsi address Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 14/28] media: mediatek: vcodec: add single allocation format Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 15/28] media: mediatek: vcodec: support " Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 16/28] media: mediatek: vcodec: support single allocation buffer Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 17/28] media: mediatek: vcodec: re-construct h264 driver to support svp mode Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 18/28] media: mediatek: vcodec: remove parse nal_info in kernel Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 19/28] media: mediatek: vcodec: disable wait interrupt for svp mode Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 20/28] media: mediatek: vcodec: support tee decoder Yunfei Dong
2024-07-20 7:15 ` [PATCH v7 21/28] media: mediatek: vcodec: move vdec init interface to setup callback Yunfei Dong
2024-07-20 7:16 ` [PATCH v7 22/28] media: mediatek: vcodec: support hevc svp for mt8188 Yunfei Dong
2024-07-20 7:16 ` [PATCH v7 23/28] media: mediatek: vcodec: support av1 svp decoder " Yunfei Dong
2024-07-20 7:16 ` [PATCH v7 24/28] media: mediatek: vcodec: support vp9 " Yunfei Dong
2024-07-20 7:16 ` [PATCH v7 25/28] media: mediatek: vcodec: remove vsi data from common interface Yunfei Dong
2024-07-20 7:16 ` [PATCH v7 26/28] media: mediatek: vcodec: rename vsi to extend vsi Yunfei Dong
2024-07-20 7:16 ` [PATCH v7 27/28] media: mediatek: vcodec: adding non extend struct Yunfei Dong
2024-07-20 7:16 ` [PATCH v7 28/28] media: mediatek: vcodec: support extend h264 driver Yunfei Dong
2024-11-13 12:20 ` [PATCH v7 00/28] media: mediatek: add driver to support secure video decoder Sebastian Fricke
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=20240720071606.27930-10-yunfei.dong@mediatek.com \
--to=yunfei.dong@mediatek.com \
--cc=Brian.Starkey@arm.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=benjamin.gaignard@collabora.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=frkoenig@chromium.org \
--cc=hsinyi@chromium.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jkardatzke@google.com \
--cc=jstultz@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=m.szyprowski@samsung.com \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=nfraprado@collabora.com \
--cc=nhebert@chromium.org \
--cc=nicolas.dufresne@collabora.com \
--cc=sebastian.fricke@collabora.com \
--cc=stevecho@chromium.org \
--cc=sumit.semwal@linaro.org \
--cc=tfiga@chromium.org \
--cc=tjmercier@google.com \
--cc=wenst@chromium.org \
--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