iMX/i2som-imx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MLK-12881 media: camera: add error handing for BIT_RFF_OR_INT

Browse Source 
running following vte stress test will meet "mx6s-csi 21c4000.csi: mx6s_csi_irq_handler Rx fifo overflow"
and cannot be stopped to capture again.

i=0; while [ $i -lt 3000 ];do v4l2_capture_emma -D /dev/video1 -C 2 -M 0 -J 30,4 -W 640 -H 480;i=`expr $i + 1`;done

This patch adds the same handling as BIT_HRESP_ERR_INT for BIT_RFF_OR_INT
(RxFiFo OverFlow) to reset CSI as a recovery.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
This commit is contained in:
Robby Cai
2016-08-11 21:04:59 +08:00
committed by Jason Liu
parent 0d3887496e
commit 99db6bea29
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/platform/mxc/capture/mx6s_capture.c
View File

@ -1058,8 +1058,11 @@ static irqreturn_t mx6s_csi_irq_handler(int irq, void *data)
if (status & BIT_RFF_OR_INT)
dev_warn(csi_dev->dev, "%s Rx fifo overflow\n", __func__);
if (status & BIT_HRESP_ERR_INT)
dev_warn(csi_dev->dev, "%s Hresponse error detected\n",
__func__);
if (status & BIT_HRESP_ERR_INT) {
if (status & (BIT_RFF_OR_INT|BIT_HRESP_ERR_INT)) {
/* software reset */
/* Disable csi */
@ -1084,8 +1087,6 @@ static irqreturn_t mx6s_csi_irq_handler(int irq, void *data)
/* Ensable csi */
cr18 |= BIT_CSI_ENABLE;
csi_write(csi_dev, cr18, CSI_CSICR18);
pr_warning("Hresponse error is detected.\n");
}
if (status & BIT_ADDR_CH_ERR_INT) {