* [PATCH] soc_camera: cleanup control device on async_unbind
@ 2016-01-04 12:48 Wolfram Sang
2016-01-09 11:29 ` Guennadi Liakhovetski
2016-02-07 13:23 ` Niklas Söderlund
0 siblings, 2 replies; 6+ messages in thread
From: Wolfram Sang @ 2016-01-04 12:48 UTC (permalink / raw)
To: linux-sh
Cc: Wolfram Sang, Guennadi Liakhovetski, Mauro Carvalho Chehab, linux-media
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
I got the following WARN on a simple unbind/bind cycle:
root@Lager:/sys/bus/i2c/drivers/adv7180# echo 6-0020 > unbind
root@Lager:/sys/bus/i2c/drivers/adv7180# echo 6-0020 > bind
[ 31.097652] adv7180 6-0020: chip found @ 0x20 (e6520000.i2c)
[ 31.123744] ------------[ cut here ]------------
[ 31.128413] WARNING: CPU: 3 PID: 873 at drivers/media/platform/soc_camera/soc_camera.c:1463 soc_camera_async_bound+0x40/0xa0()
[ 31.139896] CPU: 3 PID: 873 Comm: sh Not tainted 4.4.0-rc3-00062-ge8ae2c0b6bca2a #172
[ 31.147815] Hardware name: Generic R8A7790 (Flattened Device Tree)
[ 31.154056] Backtrace:
[ 31.156575] [<c0014bc0>] (dump_backtrace) from [<c0014d80>] (show_stack+0x20/0x24)
[ 31.164233] r6:c05c5b33 r5:00000009 r4:00000000 r3:00404100
[ 31.170017] [<c0014d60>] (show_stack) from [<c01e2344>] (dump_stack+0x78/0x94)
[ 31.177344] [<c01e22cc>] (dump_stack) from [<c0029e7c>] (warn_slowpath_common+0x98/0xc4)
[ 31.185518] r4:00000000 r3:00000000
[ 31.189172] [<c0029de4>] (warn_slowpath_common) from [<c0029fa0>] (warn_slowpath_null+0x2c/0x34)
[ 31.198043] r8:eb38df28 r7:eb38c5d0 r6:eb38de80 r5:e6962810 r4:eb38de80
[ 31.204898] [<c0029f74>] (warn_slowpath_null) from [<c0356348>] (soc_camera_async_bound+0x40/0xa0)
[ 31.213955] [<c0356308>] (soc_camera_async_bound) from [<c03499a0>] (v4l2_async_test_notify+0x9c/0x108)
[ 31.223430] r5:eb38c5ec r4:eb38de80
[ 31.227084] [<c0349904>] (v4l2_async_test_notify) from [<c0349dd8>] (v4l2_async_register_subdev+0x88/0xd0)
[ 31.236822] r7:c07115c8 r6:c071160c r5:eb38c5ec r4:eb38de80
[ 31.242622] [<c0349d50>] (v4l2_async_register_subdev) from [<c0337040>] (adv7180_probe+0x2c8/0x3a4)
[ 31.251753] r8:00000000 r7:00000001 r6:eb38de80 r5:ea973400 r4:eb38de10 r3:00000000
[ 31.259660] [<c0336d78>] (adv7180_probe) from [<c032dd80>] (i2c_device_probe+0x1a0/0x1e4)
This gets fixed by clearing the control device pointer on async_unbind.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
I stumbled over this while playing with OF_DYNAMIC and rebinding various
devices through that. I have to admit I am not actually using the camera
interface besides binding to it. This shouldn't make a difference, though :)
Stable material, I'd think.
drivers/media/platform/soc_camera/soc_camera.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index dc98122e78dc50..361275c9f770d7 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1493,6 +1493,8 @@ static void soc_camera_async_unbind(struct v4l2_async_notifier *notifier,
struct soc_camera_async_client, notifier);
struct soc_camera_device *icd = platform_get_drvdata(sasc->pdev);
+ icd->control = NULL;
+
if (icd->clk) {
v4l2_clk_unregister(icd->clk);
icd->clk = NULL;
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] soc_camera: cleanup control device on async_unbind
2016-01-04 12:48 [PATCH] soc_camera: cleanup control device on async_unbind Wolfram Sang
@ 2016-01-09 11:29 ` Guennadi Liakhovetski
2016-01-09 13:16 ` Wolfram Sang
2016-01-09 13:19 ` Wolfram Sang
2016-02-07 13:23 ` Niklas Söderlund
1 sibling, 2 replies; 6+ messages in thread
From: Guennadi Liakhovetski @ 2016-01-09 11:29 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-sh, Mauro Carvalho Chehab, linux-media
Hi Wolfram,
Thanks for the patch! From looking at it, I agree, that this looks like a
fix, and I even would recommend it for stable, but - at least for that I'd
like this patch to actually be tested! At least if someone could try to
use the camera after such a unbind / bind cycle. Would you be able to test
this? Until then I'll just push this for the forthcoming 4.5.
Thanks
Guennadi
On Mon, 4 Jan 2016, Wolfram Sang wrote:
> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
>
> I got the following WARN on a simple unbind/bind cycle:
>
> root@Lager:/sys/bus/i2c/drivers/adv7180# echo 6-0020 > unbind
> root@Lager:/sys/bus/i2c/drivers/adv7180# echo 6-0020 > bind
> [ 31.097652] adv7180 6-0020: chip found @ 0x20 (e6520000.i2c)
> [ 31.123744] ------------[ cut here ]------------
> [ 31.128413] WARNING: CPU: 3 PID: 873 at drivers/media/platform/soc_camera/soc_camera.c:1463 soc_camera_async_bound+0x40/0xa0()
> [ 31.139896] CPU: 3 PID: 873 Comm: sh Not tainted 4.4.0-rc3-00062-ge8ae2c0b6bca2a #172
> [ 31.147815] Hardware name: Generic R8A7790 (Flattened Device Tree)
> [ 31.154056] Backtrace:
> [ 31.156575] [<c0014bc0>] (dump_backtrace) from [<c0014d80>] (show_stack+0x20/0x24)
> [ 31.164233] r6:c05c5b33 r5:00000009 r4:00000000 r3:00404100
> [ 31.170017] [<c0014d60>] (show_stack) from [<c01e2344>] (dump_stack+0x78/0x94)
> [ 31.177344] [<c01e22cc>] (dump_stack) from [<c0029e7c>] (warn_slowpath_common+0x98/0xc4)
> [ 31.185518] r4:00000000 r3:00000000
> [ 31.189172] [<c0029de4>] (warn_slowpath_common) from [<c0029fa0>] (warn_slowpath_null+0x2c/0x34)
> [ 31.198043] r8:eb38df28 r7:eb38c5d0 r6:eb38de80 r5:e6962810 r4:eb38de80
> [ 31.204898] [<c0029f74>] (warn_slowpath_null) from [<c0356348>] (soc_camera_async_bound+0x40/0xa0)
> [ 31.213955] [<c0356308>] (soc_camera_async_bound) from [<c03499a0>] (v4l2_async_test_notify+0x9c/0x108)
> [ 31.223430] r5:eb38c5ec r4:eb38de80
> [ 31.227084] [<c0349904>] (v4l2_async_test_notify) from [<c0349dd8>] (v4l2_async_register_subdev+0x88/0xd0)
> [ 31.236822] r7:c07115c8 r6:c071160c r5:eb38c5ec r4:eb38de80
> [ 31.242622] [<c0349d50>] (v4l2_async_register_subdev) from [<c0337040>] (adv7180_probe+0x2c8/0x3a4)
> [ 31.251753] r8:00000000 r7:00000001 r6:eb38de80 r5:ea973400 r4:eb38de10 r3:00000000
> [ 31.259660] [<c0336d78>] (adv7180_probe) from [<c032dd80>] (i2c_device_probe+0x1a0/0x1e4)
>
> This gets fixed by clearing the control device pointer on async_unbind.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
>
> I stumbled over this while playing with OF_DYNAMIC and rebinding various
> devices through that. I have to admit I am not actually using the camera
> interface besides binding to it. This shouldn't make a difference, though :)
>
> Stable material, I'd think.
>
> drivers/media/platform/soc_camera/soc_camera.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
> index dc98122e78dc50..361275c9f770d7 100644
> --- a/drivers/media/platform/soc_camera/soc_camera.c
> +++ b/drivers/media/platform/soc_camera/soc_camera.c
> @@ -1493,6 +1493,8 @@ static void soc_camera_async_unbind(struct v4l2_async_notifier *notifier,
> struct soc_camera_async_client, notifier);
> struct soc_camera_device *icd = platform_get_drvdata(sasc->pdev);
>
> + icd->control = NULL;
> +
> if (icd->clk) {
> v4l2_clk_unregister(icd->clk);
> icd->clk = NULL;
> --
> 2.1.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] soc_camera: cleanup control device on async_unbind
2016-01-09 11:29 ` Guennadi Liakhovetski
@ 2016-01-09 13:16 ` Wolfram Sang
2016-01-09 13:19 ` Wolfram Sang
1 sibling, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2016-01-09 13:16 UTC (permalink / raw)
To: Guennadi Liakhovetski; +Cc: linux-sh, Mauro Carvalho Chehab, linux-media
[-- Attachment #1: Type: text/plain, Size: 436 bytes --]
> Thanks for the patch! From looking at it, I agree, that this looks like a
> fix, and I even would recommend it for stable, but - at least for that I'd
> like this patch to actually be tested! At least if someone could try to
> use the camera after such a unbind / bind cycle. Would you be able to test
> this? Until then I'll just push this for the forthcoming 4.5.
I'll try to get it tested.
Thanks,
Wolfram
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] soc_camera: cleanup control device on async_unbind
2016-01-09 11:29 ` Guennadi Liakhovetski
2016-01-09 13:16 ` Wolfram Sang
@ 2016-01-09 13:19 ` Wolfram Sang
1 sibling, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2016-01-09 13:19 UTC (permalink / raw)
To: Guennadi Liakhovetski; +Cc: linux-sh, Mauro Carvalho Chehab, linux-media
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
> this? Until then I'll just push this for the forthcoming 4.5.
Come to think of it: I don't have the setup to test this, and the people
which have that are hopefully off for the weekend. Since 4.4 is to be
released on Sunday anyhow, 4.5 sounds just fine to me.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] soc_camera: cleanup control device on async_unbind
2016-01-04 12:48 [PATCH] soc_camera: cleanup control device on async_unbind Wolfram Sang
2016-01-09 11:29 ` Guennadi Liakhovetski
@ 2016-02-07 13:23 ` Niklas Söderlund
2016-02-07 22:08 ` Wolfram Sang
1 sibling, 1 reply; 6+ messages in thread
From: Niklas Söderlund @ 2016-02-07 13:23 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-sh, Guennadi Liakhovetski, Mauro Carvalho Chehab, linux-media
* Wolfram Sang <wsa@the-dreams.de> [2016-01-04 13:48:24 +0100]:
> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
>
> I got the following WARN on a simple unbind/bind cycle:
>
> root@Lager:/sys/bus/i2c/drivers/adv7180# echo 6-0020 > unbind
> root@Lager:/sys/bus/i2c/drivers/adv7180# echo 6-0020 > bind
> [ 31.097652] adv7180 6-0020: chip found @ 0x20 (e6520000.i2c)
> [ 31.123744] ------------[ cut here ]------------
> [ 31.128413] WARNING: CPU: 3 PID: 873 at drivers/media/platform/soc_camera/soc_camera.c:1463 soc_camera_async_bound+0x40/0xa0()
> [ 31.139896] CPU: 3 PID: 873 Comm: sh Not tainted 4.4.0-rc3-00062-ge8ae2c0b6bca2a #172
> [ 31.147815] Hardware name: Generic R8A7790 (Flattened Device Tree)
> [ 31.154056] Backtrace:
> [ 31.156575] [<c0014bc0>] (dump_backtrace) from [<c0014d80>] (show_stack+0x20/0x24)
> [ 31.164233] r6:c05c5b33 r5:00000009 r4:00000000 r3:00404100
> [ 31.170017] [<c0014d60>] (show_stack) from [<c01e2344>] (dump_stack+0x78/0x94)
> [ 31.177344] [<c01e22cc>] (dump_stack) from [<c0029e7c>] (warn_slowpath_common+0x98/0xc4)
> [ 31.185518] r4:00000000 r3:00000000
> [ 31.189172] [<c0029de4>] (warn_slowpath_common) from [<c0029fa0>] (warn_slowpath_null+0x2c/0x34)
> [ 31.198043] r8:eb38df28 r7:eb38c5d0 r6:eb38de80 r5:e6962810 r4:eb38de80
> [ 31.204898] [<c0029f74>] (warn_slowpath_null) from [<c0356348>] (soc_camera_async_bound+0x40/0xa0)
> [ 31.213955] [<c0356308>] (soc_camera_async_bound) from [<c03499a0>] (v4l2_async_test_notify+0x9c/0x108)
> [ 31.223430] r5:eb38c5ec r4:eb38de80
> [ 31.227084] [<c0349904>] (v4l2_async_test_notify) from [<c0349dd8>] (v4l2_async_register_subdev+0x88/0xd0)
> [ 31.236822] r7:c07115c8 r6:c071160c r5:eb38c5ec r4:eb38de80
> [ 31.242622] [<c0349d50>] (v4l2_async_register_subdev) from [<c0337040>] (adv7180_probe+0x2c8/0x3a4)
> [ 31.251753] r8:00000000 r7:00000001 r6:eb38de80 r5:ea973400 r4:eb38de10 r3:00000000
> [ 31.259660] [<c0336d78>] (adv7180_probe) from [<c032dd80>] (i2c_device_probe+0x1a0/0x1e4)
>
> This gets fixed by clearing the control device pointer on async_unbind.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Tested on Koelsch and the camera works fine after a unbind/bind
operation.
> ---
>
> I stumbled over this while playing with OF_DYNAMIC and rebinding various
> devices through that. I have to admit I am not actually using the camera
> interface besides binding to it. This shouldn't make a difference, though :)
>
> Stable material, I'd think.
>
> drivers/media/platform/soc_camera/soc_camera.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
> index dc98122e78dc50..361275c9f770d7 100644
> --- a/drivers/media/platform/soc_camera/soc_camera.c
> +++ b/drivers/media/platform/soc_camera/soc_camera.c
> @@ -1493,6 +1493,8 @@ static void soc_camera_async_unbind(struct v4l2_async_notifier *notifier,
> struct soc_camera_async_client, notifier);
> struct soc_camera_device *icd = platform_get_drvdata(sasc->pdev);
>
> + icd->control = NULL;
> +
> if (icd->clk) {
> v4l2_clk_unregister(icd->clk);
> icd->clk = NULL;
> --
> 2.1.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] soc_camera: cleanup control device on async_unbind
2016-02-07 13:23 ` Niklas Söderlund
@ 2016-02-07 22:08 ` Wolfram Sang
0 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2016-02-07 22:08 UTC (permalink / raw)
To: linux-sh, Guennadi Liakhovetski, Mauro Carvalho Chehab, linux-media
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
> > This gets fixed by clearing the control device pointer on async_unbind.
> >
> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
>
> Tested-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
>
> Tested on Koelsch and the camera works fine after a unbind/bind
> operation.
Thanks a lot, Niklas!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-07 22:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-04 12:48 [PATCH] soc_camera: cleanup control device on async_unbind Wolfram Sang
2016-01-09 11:29 ` Guennadi Liakhovetski
2016-01-09 13:16 ` Wolfram Sang
2016-01-09 13:19 ` Wolfram Sang
2016-02-07 13:23 ` Niklas Söderlund
2016-02-07 22:08 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).