2019-08-24 00:30:45

by Steve Longerbeam

[permalink] [raw]
Subject: [PATCH 1/2] media: imx: Move capture device init to registered

If the CSI is unregistered and then registered again without the
driver being removed and re-probed (which will happen when the media
device is removed and re-probed without also removing/re-probing the
CSI), the result is the kobject error and backtrace "tried to init an
initialized object". This is because the video device is left in an
initialized state after being unregistered, thus the video device's
underlying kobject is also left in an initialized state when the device
is registered again.

Fix this by moving imx_media_capture_device_init() and _remove()
into csi_registered() and csi_unregistered(). This will create a new
un-initialized video device when the CSI is re-registered. Do this for
all the subdevices that register a capture device.

Reported-by: Russell King <[email protected]>
Signed-off-by: Steve Longerbeam <[email protected]>
---
drivers/staging/media/imx/imx-ic-prpencvf.c | 24 ++++++++++++---------
drivers/staging/media/imx/imx-media-csi.c | 20 ++++++++++-------
drivers/staging/media/imx/imx7-media-csi.c | 22 +++++++++----------
3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
index 67ffa46a8e96..301f5fce53c0 100644
--- a/drivers/staging/media/imx/imx-ic-prpencvf.c
+++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
@@ -1271,17 +1271,26 @@ static int prp_registered(struct v4l2_subdev *sd)
if (ret)
return ret;

+ priv->vdev = imx_media_capture_device_init(ic_priv->ipu_dev,
+ &ic_priv->sd,
+ PRPENCVF_SRC_PAD);
+ if (IS_ERR(priv->vdev))
+ return PTR_ERR(priv->vdev);
+
ret = imx_media_capture_device_register(priv->vdev);
if (ret)
- return ret;
+ goto remove_vdev;

ret = prp_init_controls(priv);
if (ret)
- goto unreg;
+ goto unreg_vdev;

return 0;
-unreg:
+
+unreg_vdev:
imx_media_capture_device_unregister(priv->vdev);
+remove_vdev:
+ imx_media_capture_device_remove(priv->vdev);
return ret;
}

@@ -1290,6 +1299,8 @@ static void prp_unregistered(struct v4l2_subdev *sd)
struct prp_priv *priv = sd_to_priv(sd);

imx_media_capture_device_unregister(priv->vdev);
+ imx_media_capture_device_remove(priv->vdev);
+
v4l2_ctrl_handler_free(&priv->ctrl_hdlr);
}

@@ -1336,12 +1347,6 @@ static int prp_init(struct imx_ic_priv *ic_priv)
spin_lock_init(&priv->irqlock);
timer_setup(&priv->eof_timeout_timer, prp_eof_timeout, 0);

- priv->vdev = imx_media_capture_device_init(ic_priv->ipu_dev,
- &ic_priv->sd,
- PRPENCVF_SRC_PAD);
- if (IS_ERR(priv->vdev))
- return PTR_ERR(priv->vdev);
-
mutex_init(&priv->lock);

return 0;
@@ -1352,7 +1357,6 @@ static void prp_remove(struct imx_ic_priv *ic_priv)
struct prp_priv *priv = ic_priv->task_priv;

mutex_destroy(&priv->lock);
- imx_media_capture_device_remove(priv->vdev);
}

struct imx_ic_ops imx_ic_prpencvf_ops = {
diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index 367e39f5b382..b3f1cf08a102 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1797,12 +1797,22 @@ static int csi_registered(struct v4l2_subdev *sd)
if (ret)
goto free_fim;

+ priv->vdev = imx_media_capture_device_init(priv->sd.dev,
+ &priv->sd,
+ CSI_SRC_PAD_IDMAC);
+ if (IS_ERR(priv->vdev)) {
+ ret = PTR_ERR(priv->vdev);
+ goto free_fim;
+ }
+
ret = imx_media_capture_device_register(priv->vdev);
if (ret)
- goto free_fim;
+ goto remove_vdev;

return 0;

+remove_vdev:
+ imx_media_capture_device_remove(priv->vdev);
free_fim:
if (priv->fim)
imx_media_fim_free(priv->fim);
@@ -1816,6 +1826,7 @@ static void csi_unregistered(struct v4l2_subdev *sd)
struct csi_priv *priv = v4l2_get_subdevdata(sd);

imx_media_capture_device_unregister(priv->vdev);
+ imx_media_capture_device_remove(priv->vdev);

if (priv->fim)
imx_media_fim_free(priv->fim);
@@ -1963,11 +1974,6 @@ static int imx_csi_probe(struct platform_device *pdev)
imx_media_grp_id_to_sd_name(priv->sd.name, sizeof(priv->sd.name),
priv->sd.grp_id, ipu_get_num(priv->ipu));

- priv->vdev = imx_media_capture_device_init(priv->sd.dev, &priv->sd,
- CSI_SRC_PAD_IDMAC);
- if (IS_ERR(priv->vdev))
- return PTR_ERR(priv->vdev);
-
mutex_init(&priv->lock);

v4l2_ctrl_handler_init(&priv->ctrl_hdlr, 0);
@@ -1997,7 +2003,6 @@ static int imx_csi_probe(struct platform_device *pdev)
free:
v4l2_ctrl_handler_free(&priv->ctrl_hdlr);
mutex_destroy(&priv->lock);
- imx_media_capture_device_remove(priv->vdev);
return ret;
}

@@ -2008,7 +2013,6 @@ static int imx_csi_remove(struct platform_device *pdev)

v4l2_ctrl_handler_free(&priv->ctrl_hdlr);
mutex_destroy(&priv->lock);
- imx_media_capture_device_remove(priv->vdev);
v4l2_async_unregister_subdev(sd);
media_entity_cleanup(&sd->entity);

diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index 4ca79ff4c9b3..b61ab16a337a 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -1119,7 +1119,16 @@ static int imx7_csi_registered(struct v4l2_subdev *sd)
if (ret < 0)
return ret;

- return imx_media_capture_device_register(csi->vdev);
+ csi->vdev = imx_media_capture_device_init(csi->sd.dev, &csi->sd,
+ IMX7_CSI_PAD_SRC);
+ if (IS_ERR(csi->vdev))
+ return PTR_ERR(csi->vdev);
+
+ ret = imx_media_capture_device_register(csi->vdev);
+ if (ret)
+ imx_media_capture_device_remove(csi->vdev);
+
+ return ret;
}

static void imx7_csi_unregistered(struct v4l2_subdev *sd)
@@ -1127,6 +1136,7 @@ static void imx7_csi_unregistered(struct v4l2_subdev *sd)
struct imx7_csi *csi = v4l2_get_subdevdata(sd);

imx_media_capture_device_unregister(csi->vdev);
+ imx_media_capture_device_remove(csi->vdev);
}

static int imx7_csi_init_cfg(struct v4l2_subdev *sd,
@@ -1253,11 +1263,6 @@ static int imx7_csi_probe(struct platform_device *pdev)
csi->sd.grp_id = IMX_MEDIA_GRP_ID_CSI;
snprintf(csi->sd.name, sizeof(csi->sd.name), "csi");

- csi->vdev = imx_media_capture_device_init(csi->sd.dev, &csi->sd,
- IMX7_CSI_PAD_SRC);
- if (IS_ERR(csi->vdev))
- return PTR_ERR(csi->vdev);
-
v4l2_ctrl_handler_init(&csi->ctrl_hdlr, 0);
csi->sd.ctrl_handler = &csi->ctrl_hdlr;

@@ -1271,8 +1276,6 @@ static int imx7_csi_probe(struct platform_device *pdev)
return 0;

free:
- imx_media_capture_device_unregister(csi->vdev);
- imx_media_capture_device_remove(csi->vdev);
v4l2_ctrl_handler_free(&csi->ctrl_hdlr);

cleanup:
@@ -1300,9 +1303,6 @@ static int imx7_csi_remove(struct platform_device *pdev)
v4l2_device_unregister(&imxmd->v4l2_dev);
media_device_cleanup(&imxmd->md);

- imx_media_capture_device_unregister(csi->vdev);
- imx_media_capture_device_remove(csi->vdev);
-
v4l2_async_unregister_subdev(sd);
v4l2_ctrl_handler_free(&csi->ctrl_hdlr);

--
2.17.1


2019-08-24 11:34:27

by kernel test robot

[permalink] [raw]
Subject: Re: [PATCH 1/2] media: imx: Move capture device init to registered

Hi Steve,

I love your patch! Yet something to improve:

[auto build test ERROR on linuxtv-media/master]
[cannot apply to v5.3-rc5 next-20190823]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url: https://github.com/0day-ci/linux/commits/Steve-Longerbeam/media-imx-Move-capture-device-init-to-registered/20190824-182241
base: git://linuxtv.org/media_tree.git master
config: sparc64-allmodconfig (attached as .config)
compiler: sparc64-linux-gcc (GCC) 7.4.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.4.0 make.cross ARCH=sparc64

If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <[email protected]>

Note: the linux-review/Steve-Longerbeam/media-imx-Move-capture-device-init-to-registered/20190824-182241 HEAD 7c4284abbf1ba252792db5645a7004bd033dd3b0 builds fine.
It only hurts bisectibility.

All errors (new ones prefixed by >>):

drivers/staging/media/imx/imx-ic-prpencvf.c: In function 'prp_registered':
>> drivers/staging/media/imx/imx-ic-prpencvf.c:1274:45: error: 'ic_priv' undeclared (first use in this function); did you mean 'priv'?
priv->vdev = imx_media_capture_device_init(ic_priv->ipu_dev,
^~~~~~~
priv
drivers/staging/media/imx/imx-ic-prpencvf.c:1274:45: note: each undeclared identifier is reported only once for each function it appears in

vim +1274 drivers/staging/media/imx/imx-ic-prpencvf.c

1242
1243 /*
1244 * retrieve our pads parsed from the OF graph by the media device
1245 */
1246 static int prp_registered(struct v4l2_subdev *sd)
1247 {
1248 struct prp_priv *priv = sd_to_priv(sd);
1249 int i, ret;
1250 u32 code;
1251
1252 for (i = 0; i < PRPENCVF_NUM_PADS; i++) {
1253 priv->pad[i].flags = (i == PRPENCVF_SINK_PAD) ?
1254 MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
1255
1256 /* set a default mbus format */
1257 imx_media_enum_ipu_format(&code, 0, CS_SEL_YUV);
1258 ret = imx_media_init_mbus_fmt(&priv->format_mbus[i],
1259 640, 480, code, V4L2_FIELD_NONE,
1260 &priv->cc[i]);
1261 if (ret)
1262 return ret;
1263 }
1264
1265 /* init default frame interval */
1266 priv->frame_interval.numerator = 1;
1267 priv->frame_interval.denominator = 30;
1268
1269 ret = media_entity_pads_init(&sd->entity, PRPENCVF_NUM_PADS,
1270 priv->pad);
1271 if (ret)
1272 return ret;
1273
> 1274 priv->vdev = imx_media_capture_device_init(ic_priv->ipu_dev,
1275 &ic_priv->sd,
1276 PRPENCVF_SRC_PAD);
1277 if (IS_ERR(priv->vdev))
1278 return PTR_ERR(priv->vdev);
1279
1280 ret = imx_media_capture_device_register(priv->vdev);
1281 if (ret)
1282 goto remove_vdev;
1283
1284 ret = prp_init_controls(priv);
1285 if (ret)
1286 goto unreg_vdev;
1287
1288 return 0;
1289
1290 unreg_vdev:
1291 imx_media_capture_device_unregister(priv->vdev);
1292 remove_vdev:
1293 imx_media_capture_device_remove(priv->vdev);
1294 return ret;
1295 }
1296

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation


Attachments:
(No filename) (3.51 kB)
.config.gz (57.28 kB)
Download all attachments