Need to initialize msg and vsi information before sending to optee-os, then
calling optee invoke command to send the information to optee-os.

For the optee communication interface is different with scp, using
flag to separate them.

Signed-off-by: Yunfei Dong <yunfei.d...@mediatek.com>
---
 .../vcodec/decoder/mtk_vcodec_dec_drv.h       |  2 +
 .../mediatek/vcodec/decoder/vdec_vpu_if.c     | 49 ++++++++++++++++---
 .../mediatek/vcodec/decoder/vdec_vpu_if.h     |  4 ++
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git 
a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h 
b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h
index b1a2107f2a1e..47eca245dc07 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h
+++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h
@@ -175,6 +175,7 @@ struct mtk_vcodec_dec_pdata {
  * @vpu_inst: vpu instance pointer.
  *
  * @is_10bit_bitstream: set to true if it's 10bit bitstream
+ * @is_secure_playback: Secure Video Playback (SVP) mode
  */
 struct mtk_vcodec_dec_ctx {
        enum mtk_instance_type type;
@@ -220,6 +221,7 @@ struct mtk_vcodec_dec_ctx {
        void *vpu_inst;
 
        bool is_10bit_bitstream;
+       bool is_secure_playback;
 };
 
 /**
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c 
b/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
index 82e57ae983d5..5336769a3fb5 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
@@ -148,7 +148,10 @@ static void vpu_dec_ipi_handler(void *data, unsigned int 
len, void *priv)
 
 static int vcodec_vpu_send_msg(struct vdec_vpu_inst *vpu, void *msg, int len)
 {
-       int err, id, msgid;
+       struct mtk_vdec_optee_data_to_shm *optee_data;
+       int data_size, id, hw_id, msgid;
+       void *ack_msg, *data_msg;
+       int err;
 
        msgid = *(uint32_t *)msg;
        mtk_vdec_debug(vpu->ctx, "id=%X", msgid);
@@ -158,16 +161,46 @@ static int vcodec_vpu_send_msg(struct vdec_vpu_inst *vpu, 
void *msg, int len)
 
        if (vpu->ctx->dev->vdec_pdata->hw_arch == MTK_VDEC_LAT_SINGLE_CORE) {
                if (msgid == AP_IPIMSG_DEC_CORE ||
-                   msgid == AP_IPIMSG_DEC_CORE_END)
+                   msgid == AP_IPIMSG_DEC_CORE_END) {
+                       optee_data = &vpu->core_optee_info;
                        id = vpu->core_id;
-               else
+               } else {
+                       optee_data = &vpu->lat_optee_info;
                        id = vpu->id;
+               }
        } else {
+               optee_data = &vpu->lat_optee_info;
                id = vpu->id;
        }
 
-       err = mtk_vcodec_fw_ipi_send(vpu->ctx->dev->fw_handler, id, msg,
-                                    len, 2000);
+       if (!vpu->ctx->is_secure_playback) {
+               err = mtk_vcodec_fw_ipi_send(vpu->ctx->dev->fw_handler, id, 
msg, len, 2000);
+       } else {
+               hw_id = (id == SCP_IPI_VDEC_LAT) ? MTK_VDEC_LAT0 : 
MTK_VDEC_CORE;
+
+               mtk_vcodec_dec_optee_set_data(optee_data, msg, len, 
OPTEE_MSG_INDEX);
+
+               /* There is no need to copy the data (VSI) message to shared 
memory,
+                * but we still need to set the buffer size to a non-zero value.
+                */
+               if (msgid == AP_IPIMSG_DEC_CORE || msgid == 
AP_IPIMSG_DEC_START) {
+                       data_msg = 
mtk_vcodec_dec_get_shm_buffer_va(vpu->ctx->dev->optee_private,
+                                                                   hw_id, 
OPTEE_DATA_INDEX);
+                       data_size = 
mtk_vcodec_dec_get_shm_buffer_size(vpu->ctx->dev->optee_private,
+                                                                      hw_id, 
OPTEE_DATA_INDEX);
+                       mtk_vcodec_dec_optee_set_data(optee_data, data_msg, 
data_size,
+                                                     OPTEE_DATA_INDEX);
+               }
+
+               err = 
mtk_vcodec_dec_optee_invokd_cmd(vpu->ctx->dev->optee_private,
+                                                     hw_id, optee_data);
+               vpu->failure = err;
+
+               ack_msg = 
mtk_vcodec_dec_get_shm_buffer_va(vpu->ctx->dev->optee_private, hw_id,
+                                                          OPTEE_MSG_INDEX);
+               vpu_dec_ipi_handler(ack_msg, 0, vpu->ctx->dev);
+       }
+
        if (err) {
                mtk_vdec_err(vpu->ctx, "send fail vpu_id=%d msg_id=%X 
status=%d",
                             id, msgid, err);
@@ -213,7 +246,11 @@ int vpu_dec_init(struct vdec_vpu_inst *vpu)
                return err;
        }
 
-       if (vpu->ctx->dev->vdec_pdata->hw_arch == MTK_VDEC_LAT_SINGLE_CORE) {
+       /* Using tee interface to communicate with optee os directly for SVP 
mode,
+        * fw ipi interface is used for normal playback.
+        */
+       if (vpu->ctx->dev->vdec_pdata->hw_arch == MTK_VDEC_LAT_SINGLE_CORE &&
+           !vpu->ctx->is_secure_playback) {
                err = mtk_vcodec_fw_ipi_register(vpu->ctx->dev->fw_handler,
                                                 vpu->core_id, vpu->handler,
                                                 "vdec", vpu->ctx->dev);
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.h 
b/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.h
index fbb3f34a73f0..946e5abcc7d3 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.h
+++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.h
@@ -28,6 +28,8 @@ struct mtk_vcodec_dec_ctx;
  * @codec_type     : use codec type to separate different codecs
  * @capture_type:      used capture type to separate different capture format
  * @fb_sz  : frame buffer size of each plane
+ * @lat_optee_info  : used to send msg to optee shm buffer
+ * @core_optee_info  : used to send msg to optee shm buffer
  */
 struct vdec_vpu_inst {
        int id;
@@ -44,6 +46,8 @@ struct vdec_vpu_inst {
        unsigned int codec_type;
        unsigned int capture_type;
        unsigned int fb_sz[2];
+       struct mtk_vdec_optee_data_to_shm lat_optee_info;
+       struct mtk_vdec_optee_data_to_shm core_optee_info;
 };
 
 /**
-- 
2.18.0

Reply via email to