media: i2c: ov5647: use our own mutex for the ctrl lock
PATCH 1/1 media: i2c: ov5647: use our own mutex for the ctrl lock
__v4l2_ctrl_handler_setup() and __v4l2_ctrl_modify_range() contains an assertion to verify that the v4l2_ctrl_handler::lock is held, as it should only be called when the lock has already been acquired. Therefore use our own mutex for the ctrl lock, otherwise a warning will be reported.
--- drivers/media/i2c/ov5647.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/i2c/ov5647.c +3 -0
@@ -1288,9 +1288,12 @@ static int ov5647_init_controls(struct ov5647 *sensor) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->sd);int hblank, exposure_max, exposure_def; +struct v4l2_ctrl_handler *hdl = &sensor->ctrls;v4l2_ctrl_handler_init (&sensor->ctrls,9 ); + hdl->lock = &sensor->lock; +v4l2_ctrl_new_std (&sensor->ctrls, &ov5647_ctrl_ops,V4L2_CID_AUTOGAIN ,0 ,1 ,1 ,0 );
Signature · 1 line
2.43.0
Hi,
Quoted 7 lines · Xiaolei Wang
__v4l2_ctrl_handler_setup()and__v4l2_ctrl_modify_range()contains an assertion to verify that thev4l2_ctrl_handler::lockis held, as it should only be called when the lock has already been acquired. Therefore use our own mutex for the ctrl lock, otherwise a warning will be reported.Signed-off-by Xiaolei Wang <[email protected]>
Generally speaking as a default locking setup for sensor drivers we are moving in the direction of removing driver specific locks and instead using the control-handler lock everywhere, including using it as the active state lock, see e.g. :
https://lore.kernel.org/linux-media/[email protected]/
which sets ov02c10->sd.state_lock = ov02c10->ctrl_handler.lock and then removes a bunch of manual mutex_lock / unlock calls since all ops which get called with a sd_state will already have the lock called when operating on the active_state (and when called in try mode they should not touch anything needing locking).
Note if you also want to make the ctrl_handler lock the active state lock then you need to add calls to v4l2_subdev_init_finalize() / v4l2_subdev_cleanup() to allocate the active-state to probe().
Regards,
Hans
Quoted 21 lines
--- drivers/media/i2c/ov5647.c | 3 +++ 1 file changed, 3 insertions(+)drivers/media/i2c/ov5647.c +3
-0@@ -1288,9 +1288,12 @@ static int ov5647_init_controls(struct ov5647 *sensor) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->sd);int hblank, exposure_max, exposure_def; +struct v4l2_ctrl_handler *hdl = &sensor->ctrls;v4l2_ctrl_handler_init (&sensor->ctrls,9 ); + hdl->lock = &sensor->lock; +v4l2_ctrl_new_std (&sensor->ctrls, &ov5647_ctrl_ops,V4L2_CID_AUTOGAIN ,0 ,1 ,1 ,0 );
Sakari Ailus
maintainerHi Hans, Xiaolei,
Quoted 26 lines · On Mon, Dec 01, 2025 at 10:31:59AM +0100, [email protected] wrote:
Hi,
Quoted 7 lines · Xiaolei Wang
__v4l2_ctrl_handler_setup()and__v4l2_ctrl_modify_range()contains an assertion to verify that thev4l2_ctrl_handler::lockis held, as it should only be called when the lock has already been acquired. Therefore use our own mutex for the ctrl lock, otherwise a warning will be reported.Signed-off-by Xiaolei Wang <[email protected]>Generally speaking as a default locking setup for sensor drivers we are moving in the direction of removing driver specific locks and instead using the control-handler lock everywhere, including using it as the active state lock, see e.g. :
https://lore.kernel.org/linux-media/[email protected]/
which sets
ov02c10->sd.state_lock=ov02c10->ctrl_handler.lockand then removes a bunch of manualmutex_lock/ unlock calls since all ops which get called with asd_statewill already have the lock called when operating on theactive_state(and when called in try mode they should not touch anything needing locking).
Quoted 4 lines
Note if you also want to make the
ctrl_handlerlock the active state lock then you need to add calls tov4l2_subdev_init_finalize()/v4l2_subdev_cleanup()to allocate the active-state toprobe().
I agree with the above, but the driver is old and it uses its own lock to serialise access to its data structures while it uses the control lock separately. So this looks like a bugfix that could be backported.
I wonder if anyone still has a system with this sensor.
Signature · 3 lines
Regards, Sakari Ailus
Hello
Quoted 34 lines · Sakari Ailus
Hi Hans, Xiaolei,
Quoted 26 lines · On Mon, Dec 01, 2025 at 10:31:59AM +0100, [email protected] wrote:
Hi,
Quoted 7 lines · Xiaolei Wang
__v4l2_ctrl_handler_setup()and__v4l2_ctrl_modify_range()contains an assertion to verify that thev4l2_ctrl_handler::lockis held, as it should only be called when the lock has already been acquired. Therefore use our own mutex for the ctrl lock, otherwise a warning will be reported.Signed-off-by Xiaolei Wang <[email protected]>Generally speaking as a default locking setup for sensor drivers we are moving in the direction of removing driver specific locks and instead using the control-handler lock everywhere, including using it as the active state lock, see e.g. :
https://lore.kernel.org/linux-media/[email protected]/
which sets
ov02c10->sd.state_lock=ov02c10->ctrl_handler.lockand then removes a bunch of manualmutex_lock/ unlock calls since all ops which get called with asd_statewill already have the lock called when operating on theactive_state(and when called in try mode they should not touch anything needing locking).Quoted 4 lines
Note if you also want to make the
ctrl_handlerlock the active state lock then you need to add calls tov4l2_subdev_init_finalize()/v4l2_subdev_cleanup()to allocate the active-state toprobe().
Quoted 5 lines
I agree with the above, but the driver is old and it uses its own lock to serialise access to its data structures while it uses the control lock separately. So this looks like a bugfix that could be backported.
I wonder if anyone still has a system with this sensor.
ov5647 is the rpi camera module v1, so I guess it's still around even if a bit old. Dave in cc is the expert and maintainer of this driver.
Jai has a series in review to upstream all the remaining BSP patches for this driver.
https://lore.kernel.org/all/[email protected]/
I'll cc him as well
Quoted 6 lines
--
Regards,Sakari Ailus
Dave Stevenson
maintainerHi Sakari
Quoted 38 lines · Jacopo Mondi
Hello
Quoted 34 lines · Sakari Ailus
Hi Hans, Xiaolei,
Quoted 30 lines · On Mon, Dec 01, 2025 at 10:31:59AM +0100, [email protected] wrote:
Hi,
Quoted 7 lines · Xiaolei Wang
__v4l2_ctrl_handler_setup()and__v4l2_ctrl_modify_range()contains an assertion to verify that thev4l2_ctrl_handler::lockis held, as it should only be called when the lock has already been acquired. Therefore use our own mutex for the ctrl lock, otherwise a warning will be reported.Signed-off-by Xiaolei Wang <[email protected]>Generally speaking as a default locking setup for sensor drivers we are moving in the direction of removing driver specific locks and instead using the control-handler lock everywhere, including using it as the active state lock, see e.g. :
https://lore.kernel.org/linux-media/[email protected]/
which sets
ov02c10->sd.state_lock=ov02c10->ctrl_handler.lockand then removes a bunch of manualmutex_lock/ unlock calls since all ops which get called with asd_statewill already have the lock called when operating on theactive_state(and when called in try mode they should not touch anything needing locking).Note if you also want to make the
ctrl_handlerlock the active state lock then you need to add calls tov4l2_subdev_init_finalize()/v4l2_subdev_cleanup()to allocate the active-state toprobe().
Quoted 8 lines
Quoted 5 lines
I agree with the above, but the driver is old and it uses its own lock to serialise access to its data structures while it uses the control lock separately. So this looks like a bugfix that could be backported.
I wonder if anyone still has a system with this sensor.
ov5647 is the rpi camera module v1, so I guess it's still around even if a bit old. Dave in cc is the expert and maintainer of this driver.
Raspberry Pi stopped selling OV5647 in about 2016 after Omnivision gave a last-time-buy date in 2014/5, and we brought out the v2 camera module based on imx219. However there are still modules being sold even now - stick "OV5647" into eBay or Amazon and you'll get loads of hits.
We still support the modules, but have little enthusiasm for investing significant development effort into it whilst it remains functional.
As this is a bug fix for a genuine issue and has minimal impact, I'd be tempted to accept it. Reworking the driver to use the same mutex and all the subdev state can be done at a separate time (unless Xiaolei is really keen to do it now).
Dave
Quoted 12 lines
Jai has a series in review to upstream all the remaining BSP patches for this driver.
https://lore.kernel.org/all/[email protected]/I'll cc him as well
Quoted 6 lines
--
Regards,Sakari Ailus
Hi
Quoted 54 lines · Dave Stevenson
CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.Hi Sakari
Quoted 35 lines · Jacopo Mondi
Hello
Quoted 32 lines · Sakari Ailus
Hi Hans, Xiaolei,
Quoted 29 lines · On Mon, Dec 01, 2025 at 10:31:59AM +0100, [email protected] wrote:
Hi,
Quoted 7 lines · Xiaolei Wang
__v4l2_ctrl_handler_setup()and__v4l2_ctrl_modify_range()contains an assertion to verify that thev4l2_ctrl_handler::lockis held, as it should only be called when the lock has already been acquired. Therefore use our own mutex for the ctrl lock, otherwise a warning will be reported.Signed-off-by Xiaolei Wang <[email protected]>Generally speaking as a default locking setup for sensor drivers we are moving in the direction of removing driver specific locks and instead using the control-handler lock everywhere, including using it as the active state lock, see e.g. :
https://lore.kernel.org/linux-media/[email protected]/
which sets
ov02c10->sd.state_lock=ov02c10->ctrl_handler.lockand then removes a bunch of manualmutex_lock/ unlock calls since all ops which get called with asd_statewill already have the lock called when operating on theactive_state(and when called in try mode they should not touch anything needing locking).Note if you also want to make the
ctrl_handlerlock the active state lock then you need to add calls tov4l2_subdev_init_finalize()/v4l2_subdev_cleanup()to allocate the active-state toprobe().Quoted 7 lines
Quoted 5 lines
I agree with the above, but the driver is old and it uses its own lock to serialise access to its data structures while it uses the control lock separately. So this looks like a bugfix that could be backported.
I wonder if anyone still has a system with this sensor.
ov5647 is the rpi camera module v1, so I guess it's still around even if a bit old. Dave in cc is the expert and maintainer of this driver.
Raspberry Pi stopped selling OV5647 in about 2016 after Omnivision gave a last-time-buy date in 2014/5, and we brought out the v2 camera module based on imx219. However there are still modules being sold even now - stick "OV5647" into eBay or Amazon and you'll get loads of hits.
Quoted 7 lines
We still support the modules, but have little enthusiasm for investing significant development effort into it whilst it remains functional.
As this is a bug fix for a genuine issue and has minimal impact, I'd be tempted to accept it. Reworking the driver to use the same mutex and all the subdev state can be done at a separate time (unless Xiaolei is really keen to do it now).
Thanks for the feedback and support. I appreciate the context about the OV5647 module.
Currently, I think maintaining the current minimal fix is better, as it also
facilitates stable backporting. The driver rework can be done separately
in the future
thanks
xiaolei
Quoted 14 lines
Dave
Quoted 11 lines
Jai has a series in review to upstream all the remaining BSP patches for this driver.
https://lore.kernel.org/all/[email protected]/I'll cc him as well
Quoted 5 lines
--
Regards,Sakari Ailus
Sakari Ailus
maintainerHi Xiaolei,
Quoted 16 lines · Xiaolei Wang
__v4l2_ctrl_handler_setup()and__v4l2_ctrl_modify_range()contains an assertion to verify that thev4l2_ctrl_handler::lockis held, as it should only be called when the lock has already been acquired. Therefore use our own mutex for the ctrl lock, otherwise a warning will be reported.Signed-off-by Xiaolei Wang <[email protected]>--- drivers/media/i2c/ov5647.c | 3 +++ 1 file changed, 3 insertions(+)drivers/media/i2c/ov5647.c +0
-0
drivers/media/i2c/ov5647.c static int ov5647_init_controls(struct ov5647 *sensor) · line 1295
Quoted 8 lines
drivers/media/i2c/ov5647.c +2
-0@@ -1288,9 +1288,12 @@ static int ov5647_init_controls(struct ov5647 *sensor) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->sd);int hblank, exposure_max, exposure_def; +struct v4l2_ctrl_handler *hdl = &sensor->ctrls;v4l2_ctrl_handler_init (&sensor->ctrls,9 ); + hdl->lock = &sensor->lock;
You can use sensor->ctrls here; otherwise change the existing users first (but that should go to a separate patch anyway).
Quoted 4 lines
drivers/media/i2c/ov5647.c +1
-0+v4l2_ctrl_new_std (&sensor->ctrls, &ov5647_ctrl_ops,V4L2_CID_AUTOGAIN ,0 ,1 ,1 ,0 );
Signature · 3 lines
Kind regards, Sakari Ailus
Quoted 27 lines · Sakari Ailus
CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.Hi Xiaolei,
Quoted 21 lines · Xiaolei Wang
__v4l2_ctrl_handler_setup()and__v4l2_ctrl_modify_range()contains an assertion to verify that thev4l2_ctrl_handler::lockis held, as it should only be called when the lock has already been acquired. Therefore use our own mutex for the ctrl lock, otherwise a warning will be reported.Signed-off-by Xiaolei Wang <[email protected]>--- drivers/media/i2c/ov5647.c | 3 +++ 1 file changed, 3 insertions(+)drivers/media/i2c/ov5647.c +1
-0@@ -1288,9 +1288,12 @@ static int ov5647_init_controls(struct ov5647 *sensor) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->sd);int hblank, exposure_max, exposure_def; +struct v4l2_ctrl_handler *hdl = &sensor->ctrls;
Quoted 5 lines
drivers/media/i2c/ov5647.c static int ov5647_init_controls(struct ov5647 *sensor) · line 1295
Quoted 3 lines
drivers/media/i2c/ov5647.c +1
-0v4l2_ctrl_handler_init (&sensor->ctrls,9 ); + hdl->lock = &sensor->lock;You can use
sensor->ctrlshere; otherwise change the existing users first (but that should go to a separate patch anyway).
OK,I will send version 2.
thanks
xiaolei
Quoted 9 lines
drivers/media/i2c/ov5647.c static int ov5647_init_controls(struct ov5647 *sensor) · line 1299
Quoted 5 lines
drivers/media/i2c/ov5647.c +1
-0+v4l2_ctrl_new_std (&sensor->ctrls, &ov5647_ctrl_ops,V4L2_CID_AUTOGAIN ,0 ,1 ,1 ,0 );--
Kind regards,Sakari Ailus