hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] s5p-mfc: Put firmware to private buffer structure 

Use s5p_mfc_priv_buf structure for keeping the firmware image. This will
help handling of firmware buffer allocation in the next patches.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Andrzej Hajda <a.hajda@samsung.com>
Tested-by: Smitha T Murthy <smitha.t@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Marek Szyprowski 2017-02-08 10:48:54 -02:00 committed by Mauro Carvalho Chehab
parent ba2e161f28
commit ba5d4563c2
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
View File

@ -47,7 +47,7 @@ static int s5p_mfc_sys_init_cmd_v5(struct s5p_mfc_dev *dev)
struct s5p_mfc_cmd_args h2r_args; struct s5p_mfc_cmd_args h2r_args;
memset(&h2r_args, 0, sizeof(struct s5p_mfc_cmd_args)); memset(&h2r_args, 0, sizeof(struct s5p_mfc_cmd_args));
h2r_args.arg[0] = dev->fw_size; h2r_args.arg[0] = dev->fw_buf.size;
return s5p_mfc_cmd_host2risc_v5(dev, S5P_FIMV_H2R_CMD_SYS_INIT, return s5p_mfc_cmd_host2risc_v5(dev, S5P_FIMV_H2R_CMD_SYS_INIT,
&h2r_args); &h2r_args);
} }

3
drivers/media/platform/s5p-mfc/s5p_mfc_common.h
View File

@ -314,8 +314,7 @@ struct s5p_mfc_dev {
int int_type; int int_type;
unsigned int int_err; unsigned int int_err;
wait_queue_head_t queue; wait_queue_head_t queue;
size_t fw_size; struct s5p_mfc_priv_buf fw_buf;
void *fw_virt_addr;
dma_addr_t dma_base[BANK_CTX_NUM]; dma_addr_t dma_base[BANK_CTX_NUM];
unsigned long hw_lock; unsigned long hw_lock;
struct s5p_mfc_ctx *ctx[MFC_NUM_CONTEXTS]; struct s5p_mfc_ctx *ctx[MFC_NUM_CONTEXTS];

36
drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
View File

@ -29,21 +29,22 @@ int s5p_mfc_alloc_firmware(struct s5p_mfc_dev *dev)
void *bank2_virt; void *bank2_virt;
dma_addr_t bank2_dma_addr; dma_addr_t bank2_dma_addr;
unsigned int align_size = 1 << MFC_BASE_ALIGN_ORDER; unsigned int align_size = 1 << MFC_BASE_ALIGN_ORDER;
struct s5p_mfc_priv_buf *fw_buf = &dev->fw_buf;
dev->fw_size = dev->variant->buf_size->fw; fw_buf->size = dev->variant->buf_size->fw;
if (dev->fw_virt_addr) { if (fw_buf->virt) {
mfc_err("Attempting to allocate firmware when it seems that it is already loaded\n"); mfc_err("Attempting to allocate firmware when it seems that it is already loaded\n");
return -ENOMEM; return -ENOMEM;
} }
dev->fw_virt_addr = dma_alloc_coherent(dev->mem_dev[BANK1_CTX], fw_buf->virt = dma_alloc_coherent(dev->mem_dev[BANK1_CTX], fw_buf->size,
dev->fw_size, &dev->dma_base[BANK1_CTX], &fw_buf->dma, GFP_KERNEL);
GFP_KERNEL); if (!fw_buf->virt) {
if (!dev->fw_virt_addr) {
mfc_err("Allocating bitprocessor buffer failed\n"); mfc_err("Allocating bitprocessor buffer failed\n");
return -ENOMEM; return -ENOMEM;
} }
dev->dma_base[BANK1_CTX] = fw_buf->dma;
if (HAS_PORTNUM(dev) && IS_TWOPORT(dev)) { if (HAS_PORTNUM(dev) && IS_TWOPORT(dev)) {
bank2_virt = dma_alloc_coherent(dev->mem_dev[BANK2_CTX], bank2_virt = dma_alloc_coherent(dev->mem_dev[BANK2_CTX],
@ -51,10 +52,9 @@ int s5p_mfc_alloc_firmware(struct s5p_mfc_dev *dev)
if (!bank2_virt) { if (!bank2_virt) {
mfc_err("Allocating bank2 base failed\n"); mfc_err("Allocating bank2 base failed\n");
dma_free_coherent(dev->mem_dev[BANK1_CTX], dev->fw_size, dma_free_coherent(dev->mem_dev[BANK1_CTX], fw_buf->size,
dev->fw_virt_addr, fw_buf->virt, fw_buf->dma);
dev->dma_base[BANK1_CTX]); fw_buf->virt = NULL;
dev->fw_virt_addr = NULL;
return -ENOMEM; return -ENOMEM;
} }
@ -101,17 +101,17 @@ int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev)
mfc_err("Firmware is not present in the /lib/firmware directory nor compiled in kernel\n"); mfc_err("Firmware is not present in the /lib/firmware directory nor compiled in kernel\n");
return -EINVAL; return -EINVAL;
} }
if (fw_blob->size > dev->fw_size) { if (fw_blob->size > dev->fw_buf.size) {
mfc_err("MFC firmware is too big to be loaded\n"); mfc_err("MFC firmware is too big to be loaded\n");
release_firmware(fw_blob); release_firmware(fw_blob);
return -ENOMEM; return -ENOMEM;
} }
if (!dev->fw_virt_addr) { if (!dev->fw_buf.virt) {
mfc_err("MFC firmware is not allocated\n"); mfc_err("MFC firmware is not allocated\n");
release_firmware(fw_blob); release_firmware(fw_blob);
return -EINVAL; return -EINVAL;
} }
memcpy(dev->fw_virt_addr, fw_blob->data, fw_blob->size); memcpy(dev->fw_buf.virt, fw_blob->data, fw_blob->size);
wmb(); wmb();
release_firmware(fw_blob); release_firmware(fw_blob);
mfc_debug_leave(); mfc_debug_leave();
@ -123,11 +123,11 @@ int s5p_mfc_release_firmware(struct s5p_mfc_dev *dev)
{ {
/* Before calling this function one has to make sure /* Before calling this function one has to make sure
* that MFC is no longer processing */ * that MFC is no longer processing */
if (!dev->fw_virt_addr) if (!dev->fw_buf.virt)
return -EINVAL; return -EINVAL;
dma_free_coherent(dev->mem_dev[BANK1_CTX], dev->fw_size, dma_free_coherent(dev->mem_dev[BANK1_CTX], dev->fw_buf.size,
dev->fw_virt_addr, dev->dma_base[BANK1_CTX]); dev->fw_buf.virt, dev->fw_buf.dma);
dev->fw_virt_addr = NULL; dev->fw_buf.virt = NULL;
return 0; return 0;
} }
@ -246,7 +246,7 @@ int s5p_mfc_init_hw(struct s5p_mfc_dev *dev)
int ret; int ret;
mfc_debug_enter(); mfc_debug_enter();
if (!dev->fw_virt_addr) { if (!dev->fw_buf.virt) {
mfc_err("Firmware memory is not allocated.\n"); mfc_err("Firmware memory is not allocated.\n");
return -EINVAL; return -EINVAL;
} }