t-head/vi-kernel
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/vi-kernel synced 2026-09-16 20:32:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Linux_SDK_V1.0.3

Browse Source
This commit is contained in:
thead_admin
2023-01-04 13:00:38 +08:00
parent 89ce56d72f
commit 9af250afa1
4 changed files with 84 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vvcam/isp/ic_dev.h
View File

@@ -1012,6 +1012,9 @@ typedef struct pp_wr_line_entry_s {
u32 buf_size; u32 buf_size;
} pp_wr_line_entry_t; } pp_wr_line_entry_t;
struct vvcam_isp_driver_dev;
struct isp_ic_dev { struct isp_ic_dev {
void __iomem *base; void __iomem *base;
void __iomem *reset; void __iomem *reset;
@@ -1098,6 +1101,9 @@ struct isp_ic_dev {
long long unsigned int ut_phy_addr; //for units test long long unsigned int ut_phy_addr; //for units test
void *ut_addr; void *ut_addr;
struct device *device; struct device *device;
int irq_num[2];
int irq_is_request[2];
struct vvcam_isp_driver_dev *isp_driver_dev;
}; };
struct isp_extmem_info { struct isp_extmem_info {

14
vvcam/isp/isp_ioctl.c
View File

@@ -2827,12 +2827,17 @@ static long isp_get_extmem(struct isp_ic_dev *dev, void __user *args)
return ret; return ret;
} }
int vvcam_free_isp_irq(struct isp_ic_dev *dev);
int vvcam_request_isp_irq(struct isp_ic_dev *dev);
long isp_priv_ioctl(struct isp_ic_dev *dev, unsigned int cmd, void __user *args) long isp_priv_ioctl(struct isp_ic_dev *dev, unsigned int cmd, void __user *args)
{ {
int ret = -1; int ret = -1;
if (!dev) {
if (!dev) {
return ret; return ret;
} }
/*isp_info("[%s:%d]cmd 0x%08x\n", __func__, __LINE__, cmd);*/ /*isp_info("[%s:%d]cmd 0x%08x\n", __func__, __LINE__, cmd);*/
switch (cmd) { switch (cmd) {
case ISPIOC_RESET: case ISPIOC_RESET:
@@ -3672,7 +3677,12 @@ long isp_priv_ioctl(struct isp_ic_dev *dev, unsigned int cmd, void __user *args)
ret = 0; ret = 0;
} }
break; break;
case ISPIOC_FREE_IRQ:
ret = vvcam_free_isp_irq(dev);
break;
case ISPIOC_REQUEST_IRQ:
ret = vvcam_request_isp_irq(dev);
break;
default: default:
isp_err("unsupported command %d", cmd); isp_err("unsupported command %d", cmd);
break; break;

3
vvcam/isp/isp_ioctl.h
View File

@@ -210,6 +210,9 @@ enum {
ISPIOC_CFG_DMA_LINE_ENTRY = 0x196, ISPIOC_CFG_DMA_LINE_ENTRY = 0x196,
ISPIOC_S_CROP = 0x197, ISPIOC_S_CROP = 0x197,
ISPIOC_GET_FRAME_MASK_INFO_ADDR = 0x198, ISPIOC_GET_FRAME_MASK_INFO_ADDR = 0x198,
ISPIOC_FREE_IRQ = 0x199,
ISPIOC_REQUEST_IRQ = 0x200,
}; };
#define ISP_GEN_CFG_UPDATE(dev) { \ #define ISP_GEN_CFG_UPDATE(dev) { \

72
vvcam/native/isp/vvcam_isp_driver_of.c
View File

@@ -106,7 +106,6 @@ struct vvcam_isp_driver_dev
struct timer_list isp_timer; struct timer_list isp_timer;
struct work_struct vvnative_wq; struct work_struct vvnative_wq;
wait_queue_head_t irq_wait; wait_queue_head_t irq_wait;
int irq_num[2];
void *private; void *private;
struct clk *aclk; struct clk *aclk;
struct clk *hclk; struct clk *hclk;
@@ -401,6 +400,50 @@ static const struct dev_pm_ops vvcam_isp_runtime_pm_ops = {
SET_RUNTIME_PM_OPS(vvcam_isp_runtime_suspend, vvcam_isp_runtime_resume, NULL) SET_RUNTIME_PM_OPS(vvcam_isp_runtime_suspend, vvcam_isp_runtime_resume, NULL)
}; };
int vvcam_free_isp_irq(struct isp_ic_dev *dev)
{
if (dev->irq_is_request[1] == 0) {
return 0;
}
free_irq(dev->irq_num[1], dev->isp_driver_dev);
dev->irq_is_request[1] = 0;
pr_info("%s isp free irq\n", __func__);
return 0;
}
int vvcam_request_isp_irq(struct isp_ic_dev *dev)
{
if (dev->irq_is_request[1] == 1) {
return 0;
}
uint32_t irq_mask0 = isp_read_reg(dev, REG_ADDR(miv2_imsc));
uint32_t irq_mask1 = isp_read_reg(dev, REG_ADDR(miv2_imsc1));
uint32_t irq_mask2 = isp_read_reg(dev, REG_ADDR(miv2_imsc2));
isp_write_reg(dev, REG_ADDR(miv2_icr), 0xfffffff);
isp_write_reg(dev, REG_ADDR(miv2_icr1), 0xfffffff);
isp_write_reg(dev, REG_ADDR(miv2_icr2), 0xfffffff);
int ret = devm_request_irq(dev->device, dev->irq_num[1], vvcam_mi_irq,
IRQF_TRIGGER_RISING, "MI_IRQ", (char *)dev->isp_driver_dev);
if (ret) {
pr_err("%s, %d:request irq error, 0x%lx!\n", __func__, __LINE__, ret);
return ret;
}
isp_write_reg(dev, REG_ADDR(miv2_imsc), irq_mask0);
isp_write_reg(dev, REG_ADDR(miv2_imsc1), irq_mask1);
isp_write_reg(dev, REG_ADDR(miv2_imsc2), irq_mask2);
dev->irq_is_request[1] = 1;
pr_info("%s isp request irq\n", __func__);
return ret;
}
static int vvcam_isp_open(struct inode * inode, struct file * file) static int vvcam_isp_open(struct inode * inode, struct file * file)
{ {
struct vvcam_isp_driver_dev *pdriver_dev; struct vvcam_isp_driver_dev *pdriver_dev;
@@ -568,38 +611,42 @@ static int vvcam_isp_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, pdriver_dev); platform_set_drvdata(pdev, pdriver_dev);
pdriver_dev->pdev = pdev; pdriver_dev->pdev = pdev;
pdriver_dev->irq_num[0] = platform_get_irq(pdev, 0); pisp_dev->irq_num[0] = platform_get_irq(pdev, 0);
if (pdriver_dev->irq_num[0] == 0) { if (pisp_dev->irq_num[0] == 0) {
pr_err("%s:isp[%d]: could not map IRQ\n", __func__, pdev->id); pr_err("%s:isp[%d]: could not map IRQ\n", __func__, pdev->id);
dev_err(&pdev->dev, "could not map IRQ.\n"); dev_err(&pdev->dev, "could not map IRQ.\n");
return -ENXIO; return -ENXIO;
} }
pr_info("%s:isp[%d]: pdriver_dev->irq_num[0]=%d\n", __func__, pdev->id, pdriver_dev->irq_num[0]); pr_info("%s:isp[%d]: pisp_dev->irq_num[0]=%d\n", __func__, pdev->id, pisp_dev->irq_num[0]);
pdriver_dev->irq_num[1] = platform_get_irq(pdev, 1); pisp_dev->irq_num[1] = platform_get_irq(pdev, 1);
if (pdriver_dev->irq_num[1] == 0) { if (pisp_dev->irq_num[1] == 0) {
pr_err("%s:isp[%d]: could not map IRQ\n", __func__, pdev->id); pr_err("%s:isp[%d]: could not map IRQ\n", __func__, pdev->id);
dev_err(&pdev->dev, "could not map IRQ.\n"); dev_err(&pdev->dev, "could not map IRQ.\n");
return -ENXIO; return -ENXIO;
} }
pr_info("%s:isp[%d]: pdriver_dev->irq_num[1]=%d\n", __func__, pdev->id, pdriver_dev->irq_num[1]); pr_info("%s:isp[%d]: pisp_dev->irq_num[1]=%d\n", __func__, pdev->id, pisp_dev->irq_num[1]);
/*init work queue*/ /*init work queue*/
INIT_WORK(&pdriver_dev->vvnative_wq, vvnative_isp_work); INIT_WORK(&pdriver_dev->vvnative_wq, vvnative_isp_work);
ret = devm_request_irq(&pdev->dev, pdriver_dev->irq_num[0], vvcam_isp_irq, ret = devm_request_irq(&pdev->dev, pisp_dev->irq_num[0], vvcam_isp_irq,
IRQF_TRIGGER_RISING | IRQF_SHARED, "ISP_IRQ", (char *)pdriver_dev); IRQF_TRIGGER_RISING | IRQF_SHARED, "ISP_IRQ", (char *)pdriver_dev);
if (ret) { if (ret) {
pr_err("%s[%d]:request irq error!\n", __func__, __LINE__); pr_err("%s[%d]:request irq error!\n", __func__, __LINE__);
return ret; return ret;
} }
pisp_dev->irq_is_request[0] = 1;
ret = devm_request_irq(&pdev->dev, pdriver_dev->irq_num[1], vvcam_mi_irq, pisp_dev->isp_driver_dev = pdriver_dev;
ret = devm_request_irq(&pdev->dev, pisp_dev->irq_num[1], vvcam_mi_irq,
IRQF_TRIGGER_RISING, "MI_IRQ", (char *)pdriver_dev); IRQF_TRIGGER_RISING, "MI_IRQ", (char *)pdriver_dev);
if (ret) { if (ret) {
pr_err("%s[%d]:request irq error!\n", __func__, __LINE__); pr_err("%s[%d]:request irq error!\n", __func__, __LINE__);
return ret; return ret;
} }
pisp_dev->irq_is_request[1] = 1;
init_waitqueue_head(&pdriver_dev->irq_wait); init_waitqueue_head(&pdriver_dev->irq_wait);
@@ -710,8 +757,11 @@ static int vvcam_isp_remove(struct platform_device *pdev)
pisp_dev->ut_addr =NULL; pisp_dev->ut_addr =NULL;
} }
free_irq(pdriver_dev->irq_num[0], pdriver_dev); free_irq(pisp_dev->irq_num[0], pdriver_dev);
free_irq(pdriver_dev->irq_num[1], pdriver_dev); free_irq(pisp_dev->irq_num[1], pdriver_dev);
pisp_dev->irq_is_request[0] = 0;
pisp_dev->irq_is_request[1] = 0;
cdev_del(&pdriver_dev->cdev); cdev_del(&pdriver_dev->cdev);
device_destroy(pdriver_dev->class, pdriver_dev->devt); device_destroy(pdriver_dev->class, pdriver_dev->devt);