media: atmel: atmel-isc-base: use mutex to lock awb workq from streaming

The AWB workqueue runs in a kernel thread and needs to be synchronized
w.r.t. the streaming status.
It is possible that streaming is stopped while the AWB workq is running.
In this case it is likely that the check for vb2_start_streaming_called is
done at one point in time, but the AWB computations are done later,
including a call to isc_update_profile, which requires streaming to be
started.
Thus , isc_update_profile will fail if during this operation sequence the
streaming was stopped.
To solve this issue, a mutex is added, that will serialize the awb work and
streaming stopping, with the mention that either streaming is stopped
completely including termination of the last frame is done, and after that
the AWB work can check stream status and stop; either first AWB work is
completed and after that the streaming can stop correctly.
The awb spin lock cannot be used since this spinlock is taken in the same
context and using it in the stop streaming will result in a recursion BUG.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
index 67b4a2323fede7644f2d83db0ced0ea8a2bac571..2f07a50035c89dcd6c0fcecac336c4b5a0c3243d 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc-base.c
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
@@ -401,6 +401,7 @@ static void isc_stop_streaming(struct vb2_queue *vq)
        struct isc_buffer *buf;
        int ret;
 
+       mutex_lock(&isc->awb_mutex);
        v4l2_ctrl_activate(isc->do_wb_ctrl, false);
 
        isc->stop = true;
@@ -410,6 +411,8 @@ static void isc_stop_streaming(struct vb2_queue *vq)
                v4l2_err(&isc->v4l2_dev,
                         "Timeout waiting for end of the capture\n");
 
+       mutex_unlock(&isc->awb_mutex);
+
        /* Disable DMA interrupt */
        regmap_write(isc->regmap, ISC_INTDIS, ISC_INT_DDONE);
 
@@ -1397,10 +1400,6 @@ static void isc_awb_work(struct work_struct *w)
        u32 min, max;
        int ret;
 
-       /* streaming is not active anymore */
-       if (isc->stop)
-               return;
-
        if (ctrls->hist_stat != HIST_ENABLED)
                return;
 
@@ -1455,7 +1454,24 @@ static void isc_awb_work(struct work_struct *w)
        }
        regmap_write(regmap, ISC_HIS_CFG + isc->offsets.his,
                     hist_id | baysel | ISC_HIS_CFG_RAR);
+
+       /*
+        * We have to make sure the streaming has not stopped meanwhile.
+        * ISC requires a frame to clock the internal profile update.
+        * To avoid issues, lock the sequence with a mutex
+        */
+       mutex_lock(&isc->awb_mutex);
+
+       /* streaming is not active anymore */
+       if (isc->stop) {
+               mutex_unlock(&isc->awb_mutex);
+               return;
+       };
+
        isc_update_profile(isc);
+
+       mutex_unlock(&isc->awb_mutex);
+
        /* if awb has been disabled, we don't need to start another histogram */
        if (ctrls->awb)
                regmap_write(regmap, ISC_CTRLEN, ISC_CTRL_HISREQ);
@@ -1534,6 +1550,7 @@ static int isc_s_awb_ctrl(struct v4l2_ctrl *ctrl)
 
                isc_update_awb_ctrls(isc);
 
+               mutex_lock(&isc->awb_mutex);
                if (vb2_is_streaming(&isc->vb2_vidq)) {
                        /*
                         * If we are streaming, we can update profile to
@@ -1548,6 +1565,7 @@ static int isc_s_awb_ctrl(struct v4l2_ctrl *ctrl)
                         */
                        v4l2_ctrl_activate(isc->do_wb_ctrl, false);
                }
+               mutex_unlock(&isc->awb_mutex);
 
                /* if we have autowhitebalance on, start histogram procedure */
                if (ctrls->awb == ISC_WB_AUTO &&
@@ -1729,6 +1747,7 @@ static void isc_async_unbind(struct v4l2_async_notifier *notifier,
 {
        struct isc_device *isc = container_of(notifier->v4l2_dev,
                                              struct isc_device, v4l2_dev);
+       mutex_destroy(&isc->awb_mutex);
        cancel_work_sync(&isc->awb_work);
        video_unregister_device(&isc->video_dev);
        v4l2_ctrl_handler_free(&isc->ctrls.handler);
@@ -1838,6 +1857,8 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
        isc->current_subdev = container_of(notifier,
                                           struct isc_subdev_entity, notifier);
        mutex_init(&isc->lock);
+       mutex_init(&isc->awb_mutex);
+
        init_completion(&isc->comp);
 
        /* Initialize videobuf2 queue */
@@ -1906,6 +1927,7 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
        return 0;
 
 isc_async_complete_err:
+       mutex_destroy(&isc->awb_mutex);
        mutex_destroy(&isc->lock);
        return ret;
 }

diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
index f9ad7ec6bd13391295fd60b5cb19ff5d79fef349..ff60ba020cb99186ce8dbe8335f380179a746b43 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc.h
+++ b/drivers/media/platform/atmel/atmel-isc.h
@@ -218,6 +218,7 @@ struct isc_reg_offsets {
  *
  * @lock:              lock for serializing userspace file operations
  *                     with ISC operations
+ * @awb_mutex:         serialize access to streaming status from awb work queue
  * @awb_lock:          lock for serializing awb work queue operations
  *                     with DMA/buffer operations
  *
@@ -290,6 +291,7 @@ struct isc_device {
        struct work_struct      awb_work;
 
        struct mutex            lock;
+       struct mutex            awb_mutex;
        spinlock_t              awb_lock;
 
        struct regmap_field     *pipeline[ISC_PIPE_LINE_NODE_NUM];