Re: [PATCH 04/14] media: mediatek: vcodec: initialize msg and vsi information

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.dong@mediatek.com>
---
  .../vcodec/decoder/mtk_vcodec_dec_drv.h       |  2 +
  .../mediatek/vcodec/decoder/vdec_vpu_if.c     | 46 ++++++++++++++++---
  .../mediatek/vcodec/decoder/vdec_vpu_if.h     |  4 ++
  3 files changed, 46 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 061542c3852c..20e534151f69 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

@@ -165,6 +165,7 @@ struct mtk_vcodec_dec_pdata {
   * @vpu_inst: vpu instance pointer.
   *
   * @is_10bit_bitstream: set to true if it's 10bit bitstream
+ * @is_svp_mode: secure video playback
   */
  struct mtk_vcodec_dec_ctx {
  	enum mtk_instance_type type;

@@ -210,6 +211,7 @@ struct mtk_vcodec_dec_ctx {
  	void *vpu_inst;
  
  	bool is_10bit_bitstream;
+	bool is_svp_mode;

  };
  
  /**

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..c1a1bddf99d8 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;
+	int err, id, hw_id, msgid;
+	struct mtk_vdec_optee_data_to_shm *optee_data;
+	void *ack_msg, *data_msg;
+	int data_size;

  
  	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_svp_mode) {
+		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);
+
+		/* No need copy data(vsi) msg to share memory, set the buffer size to 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,8 @@ int vpu_dec_init(struct vdec_vpu_inst *vpu)
  		return err;
  	}
  
-	if (vpu->ctx->dev->vdec_pdata->hw_arch == MTK_VDEC_LAT_SINGLE_CORE) {
+	if (vpu->ctx->dev->vdec_pdata->hw_arch == MTK_VDEC_LAT_SINGLE_CORE &&
+	    !vpu->ctx->is_svp_mode) {

  		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;
  };
  
  /**