Setting msg and vsi information to shared buffer, then call tee invoke
function to send it to optee-os.
Signed-off-by: Yunfei Dong <yunfei.d...@mediatek.com>
---
.../vcodec/decoder/mtk_vcodec_dec_optee.c | 156 +++++++++++++++++-
.../vcodec/decoder/mtk_vcodec_dec_optee.h | 74 +++++++++
2 files changed, 226 insertions(+), 4 deletions(-)
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 bcef86f54d84..8af9a81a02e1 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
@@ -27,6 +27,13 @@ static int mtk_vcodec_dec_optee_match(struct
tee_ioctl_version_data *ver_data, c
return ver_data->impl_id == TEE_IMPL_ID_OPTEE;
}
+static inline
+struct mtk_vdec_optee_ca_info *get_ca_info(struct mtk_vdec_optee_private
*optee_private,
+ enum mtk_vdec_hw_id hw_id)
+{
+ return hw_id == MTK_VDEC_LAT0 ? &optee_private->lat_ca :
&optee_private->core_ca;
+}
+
int mtk_vcodec_dec_optee_private_init(struct mtk_vcodec_dec_dev *vcodec_dev)
{
vcodec_dev->optee_private = devm_kzalloc(&vcodec_dev->plat_dev->dev,
@@ -164,10 +171,7 @@ static void mtk_vcodec_dec_optee_deinit_hw_info(struct
mtk_vdec_optee_private *o
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;
+ ca_info = get_ca_info(optee_private, hw_id);
for (i = 0; i < OPTEE_MAX_INDEX; i++)
mtk_vcodec_dec_optee_deinit_memref(ca_info, i);
@@ -241,3 +245,147 @@ void mtk_vcodec_dec_optee_close(struct mtk_vcodec_dec_dev
*vcodec_dev)
mutex_unlock(&optee_private->tee_mutex);
}
EXPORT_SYMBOL_GPL(mtk_vcodec_dec_optee_close);
+
+static int mtk_vcodec_dec_optee_fill_shm(struct tee_param *command_params,
+ struct mtk_vdec_optee_shm_memref
*shm_memref,
+ struct mtk_vdec_optee_data_to_shm
*data,
+ int index, struct device *dev)
+{
+ if (!data->msg_buf_size[index] || !data->msg_buf[index]) {
+ pr_err(MTK_DBG_VCODEC_STR "tee invalid buf param: %d.\n",
index);
+ return -EINVAL;
+ }
+
+ *command_params = (struct tee_param) {
+ .attr = shm_memref->param_type,
+ .u.memref = {
+ .shm = shm_memref->msg_shm,
+ .size = data->msg_buf_size[index],
+ .shm_offs = 0,
+ },
+ };
+
+ if (!shm_memref->copy_to_ta) {
+ dev_dbg(dev, MTK_DBG_VCODEC_STR "share memref data: 0x%x
param_type:%llu.\n",
+ *((unsigned int *)shm_memref->msg_shm_ca_buf),
shm_memref->param_type);
+ return 0;
+ }
+
+ memset(shm_memref->msg_shm_ca_buf, 0, shm_memref->msg_shm_size);
+ memcpy(shm_memref->msg_shm_ca_buf, data->msg_buf[index],
data->msg_buf_size[index]);
+
+ dev_dbg(dev, MTK_DBG_VCODEC_STR "share memref data => msg id:0x%x 0x%x
param_type:%llu.\n",
+ *((unsigned int *)data->msg_buf[index]),
+ *((unsigned int *)shm_memref->msg_shm_ca_buf),
+ shm_memref->param_type);
+
+ return 0;
+}
+
+static int mtk_vcodec_dec_get_shm_buffer_size(struct mtk_vdec_optee_private
*optee_private,
+ enum mtk_vdec_hw_id hw_id,
+ enum mtk_vdec_optee_data_index
data_index)
+{
+ struct mtk_vdec_optee_ca_info *ca_info;
+
+ ca_info = get_ca_info(optee_private, hw_id);
+
+ return ca_info->shm_memref[data_index].msg_shm_size;
+}
+
+void mtk_vcodec_dec_optee_set_msg_info(struct mtk_vdec_optee_data_to_shm *data,
+ void *buf, int buf_size)
+{
+ data->msg_buf[OPTEE_MSG_INDEX] = buf;
+ data->msg_buf_size[OPTEE_MSG_INDEX] = buf_size;
+}
+EXPORT_SYMBOL_GPL(mtk_vcodec_dec_optee_set_msg_info);
+
+void mtk_vcodec_dec_optee_set_data_info(struct mtk_vdec_optee_data_to_shm
*data,
+ struct mtk_vcodec_dec_dev *vcodec_dev,
+ int hw_id)
+{
+ data->msg_buf[OPTEE_DATA_INDEX] =
+ mtk_vcodec_dec_get_shm_buffer_va(vcodec_dev, hw_id,
OPTEE_DATA_INDEX);
+
+ data->msg_buf_size[OPTEE_DATA_INDEX] =
+ mtk_vcodec_dec_get_shm_buffer_size(vcodec_dev->optee_private,
+ hw_id, OPTEE_DATA_INDEX);
+}
+EXPORT_SYMBOL_GPL(mtk_vcodec_dec_optee_set_data_info);
+
+int mtk_vcodec_dec_optee_invokd_cmd(struct mtk_vcodec_dec_dev *vcodec_dev,
+ enum mtk_vdec_hw_id hw_id,
+ struct mtk_vdec_optee_data_to_shm *data)
+{
+ struct mtk_vdec_optee_private *optee_private =
vcodec_dev->optee_private;
+ struct device *dev = &optee_private->vcodec_dev->plat_dev->dev;
+ struct tee_ioctl_invoke_arg trans_args;
+ struct tee_param command_params[MTK_OPTEE_MAX_TEE_PARAMS];
+ struct mtk_vdec_optee_ca_info *ca_info;
+ struct mtk_vdec_optee_shm_memref *shm_memref;
+ int ret, index;
+
+ ca_info = get_ca_info(optee_private, hw_id);
+
+ memset(&trans_args, 0, sizeof(trans_args));
+ memset(command_params, 0, sizeof(command_params));
+
+ trans_args = (struct tee_ioctl_invoke_arg) {
+ .func = ca_info->vdec_session_func,
+ .session = ca_info->vdec_session_id,
+ .num_params = MTK_OPTEE_MAX_TEE_PARAMS,
+ };
+
+ /* Fill msg command parameters */
+ for (index = 0; index < MTK_OPTEE_MAX_TEE_PARAMS; index++) {
+ shm_memref = &ca_info->shm_memref[index];
+
+ if (shm_memref->param_type == TEE_IOCTL_PARAM_ATTR_TYPE_NONE ||
+ data->msg_buf_size[index] == 0)
+ continue;
+
+ dev_dbg(dev, MTK_DBG_VCODEC_STR "tee share memory data size: %d
-> %d.\n",
+ data->msg_buf_size[index], shm_memref->msg_shm_size);
+
+ if (data->msg_buf_size[index] > shm_memref->msg_shm_size) {
+ dev_err(dev, MTK_DBG_VCODEC_STR "tee buf size bigger
than shm (%d->%d).\n",
+ data->msg_buf_size[index],
shm_memref->msg_shm_size);
+ return -EINVAL;
+ }
+
+ ret = mtk_vcodec_dec_optee_fill_shm(&command_params[index],
shm_memref,
+ data, index, dev);
+ if (ret)
+ return ret;
+ }
+
+ ret = tee_client_invoke_func(optee_private->tee_vdec_ctx, &trans_args,
command_params);
+ if (ret < 0 || trans_args.ret != 0) {
+ dev_err(dev, MTK_DBG_VCODEC_STR "tee submit command fail: 0x%x
0x%x.\n",
+ trans_args.ret, ret);
+
+ return (ret < 0) ? ret : trans_args.ret;
+ }
+
+ /* clear all attrs, set all command param to unused */
+ for (index = 0; index < MTK_OPTEE_MAX_TEE_PARAMS; index++) {
+ data->msg_buf[index] = NULL;
+ data->msg_buf_size[index] = 0;
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(mtk_vcodec_dec_optee_invokd_cmd);
+
+void *mtk_vcodec_dec_get_shm_buffer_va(struct mtk_vcodec_dec_dev *vcodec_dev,
+ enum mtk_vdec_hw_id hw_id,
+ enum mtk_vdec_optee_data_index
data_index)
+{
+ struct mtk_vdec_optee_ca_info *ca_info;
+
+ ca_info = get_ca_info(vcodec_dev->optee_private, hw_id);
+
+ return ca_info->shm_memref[data_index].msg_shm_ca_buf;
+}
+EXPORT_SYMBOL_GPL(mtk_vcodec_dec_get_shm_buffer_va);
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 271545a864d3..f9c4d0e8b9c7 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
@@ -62,6 +62,16 @@ enum mtk_vdec_optee_data_index {
OPTEE_MAX_INDEX,
};
+/**
+ * struct mtk_vdec_optee_data_to_shm - shm data used for TA
+ * @msg_buf: msg information to TA.
+ * @msg_buf_size: length of msg information.
+ */
+struct mtk_vdec_optee_data_to_shm {
+ void *msg_buf[MTK_OPTEE_MAX_TEE_PARAMS];
+ int msg_buf_size[MTK_OPTEE_MAX_TEE_PARAMS];
+};
+
/**
* struct mtk_vdec_optee_private - optee private data
* @vcodec_dev: pointer to the mtk_vcodec_dec_dev of the device
@@ -103,6 +113,45 @@ int mtk_vcodec_dec_optee_private_init(struct
mtk_vcodec_dec_dev *vcodec_dev);
*/
void mtk_vcodec_dec_optee_close(struct mtk_vcodec_dec_dev *vcodec_dev);
+/**
+ * mtk_vcodec_dec_optee_set_msg_info - set buffer to message shared memref.
+ * @data: normal world data used to init optee shared memory
+ * @buf: normal world buffer address
+ * @buf_size: buf size
+ */
+void mtk_vcodec_dec_optee_set_msg_info(struct mtk_vdec_optee_data_to_shm *data,
+ void *buf, int buf_size);
+
+/**
+ * mtk_vcodec_dec_optee_set_data - set buffer to data shared memref.
+ * @data: normal world data used to init optee shared memory
+ * @vcodec_dev: pointer to the mtk_vcodec_dec_dev of the device
+ * @hw_id: hardware index
+ */
+void mtk_vcodec_dec_optee_set_data_info(struct mtk_vdec_optee_data_to_shm
*data,
+ struct mtk_vcodec_dec_dev *vcodec_dev,
+ int hw_id);
+
+/**
+ * mtk_vcodec_dec_optee_invokd_cmd - send share memory data to optee.
+ * @vcodec_dev: pointer to the mtk_vcodec_dec_dev of the device
+ * @hw_id: hardware index
+ * @data: normal world data used to init optee share memory
+ */
+int mtk_vcodec_dec_optee_invokd_cmd(struct mtk_vcodec_dec_dev *vcodec_dev,
+ enum mtk_vdec_hw_id hw_id,
+ struct mtk_vdec_optee_data_to_shm *data);
+
+/**
+ * mtk_vcodec_dec_get_shm_buffer_va - get the shared memory virtual address
+ * @vcodec_dev: pointer to the mtk_vcodec_dec_dev of the device
+ * @hw_id: hardware index
+ * @data_index: indentify each share memory informaiton
+ */
+void *mtk_vcodec_dec_get_shm_buffer_va(struct mtk_vcodec_dec_dev *vcodec_dev,
+ enum mtk_vdec_hw_id hw_id,
+ enum mtk_vdec_optee_data_index
data_index);
+
#else
static inline int mtk_vcodec_dec_optee_open(struct mtk_vcodec_dec_dev
*vcodec_dev)
@@ -119,6 +168,31 @@ static inline void mtk_vcodec_dec_optee_close(struct
mtk_vcodec_dec_dev *vcodec_
{
}
+static inline void mtk_vcodec_dec_optee_set_msg_info(struct
mtk_vdec_optee_data_to_shm *data,
+ void *buf, int buf_size)
+{
+}
+
+static inline void mtk_vcodec_dec_optee_set_data_info(struct
mtk_vdec_optee_data_to_shm *data,
+ struct mtk_vcodec_dec_dev
*vcodec_dev,
+ int hw_id)
+{
+}
+
+static inline int mtk_vcodec_dec_optee_invokd_cmd(struct mtk_vcodec_dec_dev
*vcodec_dev,
+ enum mtk_vdec_hw_id hw_id,
+ struct
mtk_vdec_optee_data_to_shm *data)
+{
+ return 0;
+}
+
+static inline void *mtk_vcodec_dec_get_shm_buffer_va(struct mtk_vcodec_dec_dev
*vcodec_dev,
+ enum mtk_vdec_hw_id hw_id,
+ enum
mtk_vdec_optee_data_index data_index)
+{
+ return NULL;
+}
+
#endif /* CONFIG_VIDEO_MEDIATEK_VCODEC_TEE */
#endif /* _MTK_VCODEC_DEC_OPTEE_H_ */
--
2.18.0
