Commit ebebfe34 authored by Steve Longerbeam's avatar Steve Longerbeam Committed by Greg Kroah-Hartman

media: imx: prpencvf: Stop upstream before disabling IDMA channel

commit a19c2267 upstream.

Upstream must be stopped immediately after receiving the last EOF and
before disabling the IDMA channel. This can be accomplished by moving
upstream stream off to just after receiving the last EOF completion in
prp_stop(). For symmetry also move upstream stream on to end of
prp_start().

This fixes a complete system hard lockup on the SabreAuto when streaming
from the ADV7180, by repeatedly sending a stream off immediately followed
by stream on:

while true; do v4l2-ctl  -d1 --stream-mmap --stream-count=3; done

Eventually this either causes the system lockup or EOF timeouts at all
subsequent stream on, until a system reset.

The lockup occurs when disabling the IDMA channel at stream off. Stopping
the video data stream entering the IDMA channel before disabling the
channel itself appears to be a reliable fix for the hard lockup.

Fixes: f0d9c892 ("[media] media: imx: Add IC subdev drivers")
Reported-by: default avatarGaël PORTAY <gael.portay@collabora.com>
Tested-by: default avatarGaël PORTAY <gael.portay@collabora.com>
Signed-off-by: default avatarSteve Longerbeam <slongerbeam@gmail.com>
Cc: stable@vger.kernel.org	# for 4.13 and up
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61cc5315
...@@ -676,12 +676,23 @@ static int prp_start(struct prp_priv *priv) ...@@ -676,12 +676,23 @@ static int prp_start(struct prp_priv *priv)
goto out_free_nfb4eof_irq; goto out_free_nfb4eof_irq;
} }
/* start upstream */
ret = v4l2_subdev_call(priv->src_sd, video, s_stream, 1);
ret = (ret && ret != -ENOIOCTLCMD) ? ret : 0;
if (ret) {
v4l2_err(&ic_priv->sd,
"upstream stream on failed: %d\n", ret);
goto out_free_eof_irq;
}
/* start the EOF timeout timer */ /* start the EOF timeout timer */
mod_timer(&priv->eof_timeout_timer, mod_timer(&priv->eof_timeout_timer,
jiffies + msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT)); jiffies + msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT));
return 0; return 0;
out_free_eof_irq:
devm_free_irq(ic_priv->dev, priv->eof_irq, priv);
out_free_nfb4eof_irq: out_free_nfb4eof_irq:
devm_free_irq(ic_priv->dev, priv->nfb4eof_irq, priv); devm_free_irq(ic_priv->dev, priv->nfb4eof_irq, priv);
out_unsetup: out_unsetup:
...@@ -713,6 +724,12 @@ static void prp_stop(struct prp_priv *priv) ...@@ -713,6 +724,12 @@ static void prp_stop(struct prp_priv *priv)
if (ret == 0) if (ret == 0)
v4l2_warn(&ic_priv->sd, "wait last EOF timeout\n"); v4l2_warn(&ic_priv->sd, "wait last EOF timeout\n");
/* stop upstream */
ret = v4l2_subdev_call(priv->src_sd, video, s_stream, 0);
if (ret && ret != -ENOIOCTLCMD)
v4l2_warn(&ic_priv->sd,
"upstream stream off failed: %d\n", ret);
devm_free_irq(ic_priv->dev, priv->eof_irq, priv); devm_free_irq(ic_priv->dev, priv->eof_irq, priv);
devm_free_irq(ic_priv->dev, priv->nfb4eof_irq, priv); devm_free_irq(ic_priv->dev, priv->nfb4eof_irq, priv);
...@@ -1144,15 +1161,6 @@ static int prp_s_stream(struct v4l2_subdev *sd, int enable) ...@@ -1144,15 +1161,6 @@ static int prp_s_stream(struct v4l2_subdev *sd, int enable)
if (ret) if (ret)
goto out; goto out;
/* start/stop upstream */
ret = v4l2_subdev_call(priv->src_sd, video, s_stream, enable);
ret = (ret && ret != -ENOIOCTLCMD) ? ret : 0;
if (ret) {
if (enable)
prp_stop(priv);
goto out;
}
update_count: update_count:
priv->stream_count += enable ? 1 : -1; priv->stream_count += enable ? 1 : -1;
if (priv->stream_count < 0) if (priv->stream_count < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment