media_modules: CB1 VP9 fix secure stream blurred screen [2/2]

PD#SWPL-80006
b/229652967

Problem:
VP9 secure stream blurred screen, because prob has been moved
to tee.

Solution:
1.add vp9 prob interfaces, move vp9 prob process to Tee
2.modify debug flow for secure avoid crash.

refer to:
https://scgit.amlogic.com/#/c/165922/

Change-Id: I1e88722b8653ea74b38da96711d7861bbb4f2b0f
Signed-off-by: Xiaohang Cui <xiaohang.cui@amlogic.com>

diff --git a/drivers/frame_provider/decoder/vp9/vvp9.c b/drivers/frame_provider/decoder/vp9/vvp9.c
index 4ab61b4a283922bfd3cee7667031f8172ea8b703..f4e554564168804113bcb86cf5e226d517b353a1 100644 (file)
--- a/drivers/frame_provider/decoder/vp9/vvp9.c
+++ b/drivers/frame_provider/decoder/vp9/vvp9.c
@@ -6668,21 +6668,30 @@ static void vp9_local_uninit(struct VP9Decoder_s *pbi)
                                pbi->lmem_phy_addr);
                pbi->lmem_addr = NULL;
        }
-       if (pbi->prob_buffer_addr) {
-               if (pbi->prob_buffer_phy_addr)
-                       dma_free_coherent(amports_get_dma_device(),
-                               PROB_BUF_SIZE, pbi->prob_buffer_addr,
-                               pbi->prob_buffer_phy_addr);
-
+       if ((get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_G12A) &&
+               (vdec_secure(hw_to_vdec(pbi)))) {
+               tee_vp9_prob_free((u32)pbi->prob_buffer_phy_addr);
+               pbi->prob_buffer_phy_addr = 0;
+               pbi->count_buffer_phy_addr = 0;
                pbi->prob_buffer_addr = NULL;
-       }
-       if (pbi->count_buffer_addr) {
-               if (pbi->count_buffer_phy_addr)
-                       dma_free_coherent(amports_get_dma_device(),
-                               COUNT_BUF_SIZE, pbi->count_buffer_addr,
-                               pbi->count_buffer_phy_addr);
-
                pbi->count_buffer_addr = NULL;
+       } else {
+               if (pbi->prob_buffer_addr) {
+                       if (pbi->prob_buffer_phy_addr)
+                               dma_free_coherent(amports_get_dma_device(),
+                                       PROB_BUF_SIZE, pbi->prob_buffer_addr,
+                                       pbi->prob_buffer_phy_addr);
+
+                       pbi->prob_buffer_addr = NULL;
+               }
+               if (pbi->count_buffer_addr) {
+                       if (pbi->count_buffer_phy_addr)
+                               dma_free_coherent(amports_get_dma_device(),
+                                       COUNT_BUF_SIZE, pbi->count_buffer_addr,
+                                       pbi->count_buffer_phy_addr);
+
+                       pbi->count_buffer_addr = NULL;
+               }
        }
        if (pbi->mmu_enable) {
                u32 mmu_map_size = vvp9_frame_mmu_map_size(pbi);
@@ -6842,24 +6851,38 @@ static int vp9_local_init(struct VP9Decoder_s *pbi)
                pr_err("%s: failed to alloc lmem buffer\n", __func__);
                return -1;
        }
-               pbi->lmem_ptr = pbi->lmem_addr;
+       pbi->lmem_ptr = pbi->lmem_addr;
 
-       pbi->prob_buffer_addr = dma_alloc_coherent(amports_get_dma_device(),
-                               PROB_BUF_SIZE,
-                               &pbi->prob_buffer_phy_addr, GFP_KERNEL);
-       if (pbi->prob_buffer_addr == NULL) {
-               pr_err("%s: failed to alloc prob_buffer\n", __func__);
-               return -1;
-       }
-       memset(pbi->prob_buffer_addr, 0, PROB_BUF_SIZE);
-       pbi->count_buffer_addr = dma_alloc_coherent(amports_get_dma_device(),
-                               COUNT_BUF_SIZE,
-                               &pbi->count_buffer_phy_addr, GFP_KERNEL);
-       if (pbi->count_buffer_addr == NULL) {
-               pr_err("%s: failed to alloc count_buffer\n", __func__);
-               return -1;
+       if ((get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_G12A) &&
+               (vdec_secure(hw_to_vdec(pbi)))) {
+               u32 prob_addr, id;
+               id = tee_vp9_prob_malloc(&prob_addr);
+               if (prob_addr <= 0)
+                       pr_err("%s, tee[%d] malloc prob buf failed\n", __func__, id);
+               else {
+                       pbi->prob_buffer_phy_addr = prob_addr;
+                       pbi->count_buffer_phy_addr = pbi->prob_buffer_phy_addr + PROB_BUF_SIZE;
+               }
+               pbi->prob_buffer_addr = NULL;
+               pbi->count_buffer_addr = NULL;
+       } else {
+               pbi->prob_buffer_addr = dma_alloc_coherent(amports_get_dma_device(),
+                                       PROB_BUF_SIZE,
+                                       &pbi->prob_buffer_phy_addr, GFP_KERNEL);
+               if (pbi->prob_buffer_addr == NULL) {
+                       pr_err("%s: failed to alloc prob_buffer\n", __func__);
+                       return -1;
+               }
+               memset(pbi->prob_buffer_addr, 0, PROB_BUF_SIZE);
+               pbi->count_buffer_addr = dma_alloc_coherent(amports_get_dma_device(),
+                                       COUNT_BUF_SIZE,
+                                       &pbi->count_buffer_phy_addr, GFP_KERNEL);
+               if (pbi->count_buffer_addr == NULL) {
+                       pr_err("%s: failed to alloc count_buffer\n", __func__);
+                       return -1;
+               }
+               memset(pbi->count_buffer_addr, 0, COUNT_BUF_SIZE);
        }
-       memset(pbi->count_buffer_addr, 0, COUNT_BUF_SIZE);
 
        if (pbi->mmu_enable) {
                u32 mmu_map_size = vvp9_frame_mmu_map_size(pbi);
@@ -8859,7 +8882,6 @@ static irqreturn_t vvp9_isr(int irq, void *data)
        unsigned int dec_status;
        struct VP9Decoder_s *pbi = (struct VP9Decoder_s *)data;
        unsigned int adapt_prob_status;
-       struct VP9_Common_s *const cm = &pbi->common;
        uint debug_tag;
 
        WRITE_VREG(HEVC_ASSIST_MBOX0_CLR_REG, 1);
@@ -8964,33 +8986,41 @@ static irqreturn_t vvp9_isr(int irq, void *data)
        }
 #endif
        if ((adapt_prob_status & 0xff) == 0xfd) {
-               /*VP9_REQ_ADAPT_PROB*/
-               int pre_fc = (cm->frame_type == KEY_FRAME) ? 1 : 0;
-               uint8_t *prev_prob_b =
-               ((uint8_t *)pbi->prob_buffer_addr) +
-               ((adapt_prob_status >> 8) * 0x1000);
-               uint8_t *cur_prob_b =
-               ((uint8_t *)pbi->prob_buffer_addr) + 0x4000;
-               uint8_t *count_b = (uint8_t *)pbi->count_buffer_addr;
-#ifdef MULTI_INSTANCE_SUPPORT
+               struct VP9_Common_s *const cm = &pbi->common;
+
                if (pbi->m_ins_flag)
-                       reset_process_time(pbi);
-#endif
-               adapt_coef_probs(pbi->pic_count,
-                       (cm->last_frame_type == KEY_FRAME),
-                       pre_fc, (adapt_prob_status >> 8),
-                       (unsigned int *)prev_prob_b,
-                       (unsigned int *)cur_prob_b, (unsigned int *)count_b);
+                               reset_process_time(pbi);
+
+               if ((get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_G12A) &&
+                       (vdec_secure(hw_to_vdec(pbi)))) {
+                       tee_vp9_prob_process(cm->frame_type, cm->last_frame_type,
+                               adapt_prob_status, (unsigned int)pbi->prob_buffer_phy_addr);
+               } else {
+                       int pre_fc = 0;
+                       uint8_t *prev_prob_b, *cur_prob_b, *count_b;
+
+                       /*VP9_REQ_ADAPT_PROB*/
+                       pre_fc = (cm->frame_type == KEY_FRAME) ? 1 : 0;
+                       prev_prob_b = ((uint8_t *)pbi->prob_buffer_addr) +
+                               ((adapt_prob_status >> 8) * 0x1000);
+                       cur_prob_b = ((uint8_t *)pbi->prob_buffer_addr) + 0x4000;
+                       count_b = (uint8_t *)pbi->count_buffer_addr;
+
+                       adapt_coef_probs(pbi->pic_count,
+                               (cm->last_frame_type == KEY_FRAME),
+                               pre_fc, (adapt_prob_status >> 8),
+                               (unsigned int *)prev_prob_b,
+                               (unsigned int *)cur_prob_b, (unsigned int *)count_b);
+
+                       memcpy(prev_prob_b, cur_prob_b, PROB_SIZE);
+               }
 
-               memcpy(prev_prob_b, cur_prob_b, PROB_SIZE);
                WRITE_VREG(VP9_ADAPT_PROB_REG, 0);
                pbi->pic_count += 1;
 #ifdef MULTI_INSTANCE_SUPPORT
                if (pbi->m_ins_flag)
                        start_process_time(pbi);
 #endif
-
-               /*return IRQ_HANDLED;*/
        }
        return IRQ_WAKE_THREAD;
 }
@@ -9998,6 +10028,9 @@ static unsigned char get_data_check_sum
        int sum = 0;
        u8 *data = NULL;
 
+       if (vdec_secure(hw_to_vdec(pbi)))
+               return 0;
+
        if (!pbi->chunk->block->is_mapped)
                data = codec_mm_vmap(pbi->chunk->block->start +
                        pbi->chunk->offset, size);
@@ -10475,7 +10508,8 @@ static void run_front(struct vdec_s *vdec)
                READ_VREG(HEVC_STREAM_WR_PTR),
                READ_VREG(HEVC_STREAM_RD_PTR),
                pbi->start_shift_bytes);
-               if (vdec_frame_based(vdec) && pbi->chunk) {
+               if (!vdec_secure(hw_to_vdec(pbi)) &&
+                       vdec_frame_based(vdec) && pbi->chunk) {
                        u8 *data = NULL;
 
                        if (!pbi->chunk->block->is_mapped)