浏览代码

Merge branch 'CR_6292_vpu_dma_sync_samin.guo' into 'jh7110-devel'

CR6292:soft_3rdpart: VPU:  use dma_sync_single_for_cpu for flush cache

See merge request sdk/soft_3rdpart!52
andy.hu 10 月之前
父节点
当前提交
73cb9cb6d2
共有 3 个文件被更改,包括 31 次插入18 次删除
  1. 10 6
      codaj12/jdi/linux/driver/jpu.c
  2. 10 6
      wave420l/code/vdi/linux/driver/venc.c
  3. 11 6
      wave511/code/vdi/linux/driver/vdec.c

+ 10 - 6
codaj12/jdi/linux/driver/jpu.c

@@ -37,11 +37,12 @@
 #include <linux/sched/signal.h>
 #include <linux/reset.h>
 #include <linux/version.h>
-#include <soc/sifive/sifive_l2_cache.h>
 
 #include "../../../jpuapi/jpuconfig.h"
 #include "jpu.h"
 
+extern void sifive_ccache_flush_range(phys_addr_t start, size_t len);
+
 //#define ENABLE_DEBUG_MSG
 #ifdef ENABLE_DEBUG_MSG
 #define DPRINTK(args...)            printk(KERN_INFO args);
@@ -66,11 +67,6 @@
 
 //#define JPU_SUPPORT_RESERVED_VIDEO_MEMORY        //if this driver knows the dedicated video memory address
 
-static void starfive_flush_dcache(unsigned long start, unsigned long len)
-{
-	sifive_l2_flush64_range(start, len);
-}
-
 #define JPU_PLATFORM_DEVICE_NAME    "cnm_jpu"
 #define JPU_CLK_NAME                "jpege"
 #define JPU_DEV_NAME                "jpu"
@@ -204,6 +200,14 @@ static struct list_head s_inst_list_head = LIST_HEAD_INIT(s_inst_list_head);
 #define WriteJpuRegister(addr, val)     *(volatile unsigned int *)(s_jpu_register.virt_addr + addr) = (unsigned int)val
 #define WriteJpu(addr, val)             *(volatile unsigned int *)(addr) = (unsigned int)val;
 
+static void starfive_flush_dcache(phys_addr_t start, size_t len)
+{
+#ifdef ARCH_HAS_SYNC_DMA_FOR_CPU
+	dma_sync_single_for_cpu(jpu_dev, start, len, DMA_FROM_DEVICE);
+#else
+	sifive_ccache_flush_range(start, len);
+#endif
+}
 
 static int jpu_alloc_dma_buffer(jpudrv_buffer_t *jb)
 {

+ 10 - 6
wave420l/code/vdi/linux/driver/venc.c

@@ -34,12 +34,13 @@
 #include <linux/version.h>
 #include <linux/of.h>
 #include <linux/pm_runtime.h>
-#include <soc/sifive/sifive_l2_cache.h>
 
 #include "../../../vpuapi/vpuconfig.h"
 
 #include "vpu.h"
 
+extern void sifive_ccache_flush_range(phys_addr_t start, size_t len);
+
 #ifndef  CONFIG_PM
 #define CONFIG_PM
 #endif
@@ -68,11 +69,6 @@
 /* if this driver knows the dedicated video memory address */
 //#define VPU_SUPPORT_RESERVED_VIDEO_MEMORY
 
-static void starfive_flush_dcache(unsigned long start, unsigned long len)
-{
-	sifive_l2_flush64_range(start, len);
-}
-
 #define VPU_PLATFORM_DEVICE_NAME "venc"
 #define VPU_CLK_NAME "vcoenc"
 #define VPU_DEV_NAME "venc"
@@ -355,6 +351,14 @@ static u32	s_vpu_reg_store[MAX_NUM_VPU_CORE][64];
 #define	WriteVpuRegister(addr, val)	*(volatile unsigned int *)(s_vpu_register.virt_addr + s_bit_firmware_info[core].reg_base_offset + addr) = (unsigned int)val
 #define	WriteVpu(addr, val)			*(volatile unsigned int *)(addr) = (unsigned int)val;
 
+static void starfive_flush_dcache(phys_addr_t start, size_t len)
+{
+#ifdef ARCH_HAS_SYNC_DMA_FOR_CPU
+	dma_sync_single_for_cpu(vpu_dev, start, len, DMA_FROM_DEVICE);
+#else
+	sifive_ccache_flush_range(start, len);
+#endif
+}
 
 static int vpu_alloc_dma_buffer(vpudrv_buffer_t *vb)
 {

+ 11 - 6
wave511/code/vdi/linux/driver/vdec.c

@@ -50,11 +50,12 @@
 #include <linux/kthread.h>
 #include <linux/reset.h>
 #include <asm/io.h>
-#include <soc/sifive/sifive_l2_cache.h>
 #include "../../../vpuapi/vpuconfig.h"
 
 #include "vpu.h"
 
+extern void sifive_ccache_flush_range(phys_addr_t start, size_t len);
+
 //#define ENABLE_DEBUG_MSG
 #ifdef ENABLE_DEBUG_MSG
 #define DPRINTK(args...)        printk(KERN_INFO args);
@@ -87,11 +88,6 @@
 /* if this driver knows the dedicated video memory address */
 //#define VPU_SUPPORT_RESERVED_VIDEO_MEMORY
 
-static void starfive_flush_dcache(unsigned long start, unsigned long len)
-{
-	sifive_l2_flush64_range(start, len);
-}
-
 #define VPU_PLATFORM_DEVICE_NAME "vdec"
 #define VPU_CLK_NAME "vcodec"
 #define VPU_DEV_NAME "vdec"
@@ -476,6 +472,15 @@ static int vpu_freq_init(struct device *dev)
 
 #endif
 
+static void starfive_flush_dcache(phys_addr_t start, size_t len)
+{
+#ifdef ARCH_HAS_SYNC_DMA_FOR_CPU
+	dma_sync_single_for_cpu(vpu_dev, start, len, DMA_FROM_DEVICE);
+#else
+	sifive_ccache_flush_range(start, len);
+#endif
+}
+
 static int vpu_alloc_dma_buffer(vpudrv_buffer_t *vb)
 {
     if (!vb)