media: imx: Fix subdev unregister/register issues
Steve Longerbeam
maintainerv2 cover media: imx: Fix subdev unregister/register issues
If the media device module is removed and re-probed without also removing and re-probing the subdevice modules, .unregister() and .register() ops are called on the subdevices without the subdevice drivers being removed and re-probed. This creates two problems:
- the CSI and PRPENCVF subdevices attempt to register a stale video capture device resulting in the kobject "tried to init an initialized object" backtrace.
- pad graph objects are added to the media device pad list twice, resulting in list corruption on the pad list.
The following two patches fix those issues.
History:
v2:
- Add missing local var ic_priv in prp_registered() in first patch.
Steve Longerbeam (2):
media: imx: Move capture device init to registered
media: imx: Move pads init to probe
drivers/staging/media/imx/imx-ic-prp.c | 25 ++++----- drivers/staging/media/imx/imx-ic-prpencvf.c | 51 ++++++++++--------- drivers/staging/media/imx/imx-media-capture.c | 15 +++--- drivers/staging/media/imx/imx-media-csi.c | 35 +++++++------ drivers/staging/media/imx/imx-media-vdic.c | 27 ++++------ drivers/staging/media/imx/imx6-mipi-csi2.c | 27 +++++----- drivers/staging/media/imx/imx7-media-csi.c | 38 +++++++------- drivers/staging/media/imx/imx7-mipi-csis.c | 23 +++------ 8 files changed, 114 insertions(+), 127 deletions(-)
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v2 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.
---
Changes in v2:
Add missing local var ic_priv in prp_registered().
--- drivers/staging/media/imx/imx-ic-prpencvf.c | 25 ++++++++++++--------- drivers/staging/media/imx/imx-media-csi.c | 20 ++++++++++------- drivers/staging/media/imx/imx7-media-csi.c | 22 +++++++++--------- 3 files changed, 38 insertions(+), 29 deletions(-)
drivers/staging/media/imx/imx-ic-prpencvf.c +15 -10
@@ -1246,6 +1246,7 @@ static int prp_s_frame_interval(struct v4l2_subdev *sd,static int prp_registered (struct v4l2_subdev *sd) {struct prp_priv *priv =sd_to_priv (sd); +struct imx_ic_priv *ic_priv = priv->ic_priv;int i, ret;u32 code;
@@ -1271,17 +1272,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 +1300,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 +1348,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 +1358,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 = {
drivers/staging/media/imx/imx-media-csi.c +12 -8
@@ -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);
drivers/staging/media/imx/imx7-media-csi.c +11 -11
@@ -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);
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v2 2/2 media: imx: Move pads init to probe
In reply to Steve LongerbeamIf a subdevice 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 subdevice), media_device_register_entity() is called with a non-zero entity->num_pads, and then the subdevice's .registered callback calls media_entity_pads_init(). Thus the subdevice's pad objects are added to the media device pad list twice, causing list corruption.
One way to fix this would be to create media_entity_pads_destroy(), and call it in the subdevice's .unregistered callback. But calling media_entity_pads_init() in the .registered callbacks was done for legacy reasons and is no longer necessary, so move the call to media_entity_pads_init() into the subdevice's probe functions. This fixes the duplicate pad obejcts in the media device pad list.
--- drivers/staging/media/imx/imx-ic-prp.c | 25 ++++++----------- drivers/staging/media/imx/imx-ic-prpencvf.c | 28 +++++++++---------- drivers/staging/media/imx/imx-media-capture.c | 15 +++++----- drivers/staging/media/imx/imx-media-csi.c | 21 +++++++------- drivers/staging/media/imx/imx-media-vdic.c | 27 ++++++++---------- drivers/staging/media/imx/imx6-mipi-csi2.c | 27 ++++++++---------- drivers/staging/media/imx/imx7-media-csi.c | 18 ++++++------ drivers/staging/media/imx/imx7-mipi-csis.c | 23 +++++---------- 8 files changed, 81 insertions(+), 103 deletions(-)
drivers/staging/media/imx/imx-ic-prp.c +9 -16
@@ -428,32 +428,19 @@ static int prp_s_frame_interval(struct v4l2_subdev *sd,return 0 ; } -/* -* retrieve our pads parsed from the OF graph by the media device -*/ static int prp_registered (struct v4l2_subdev *sd) {struct prp_priv *priv =sd_to_priv (sd); -int i, ret;u32 code; -for (i =0 ; i <PRP_NUM_PADS ; i++) { - priv->pad[i].flags = (i ==PRP_SINK_PAD ) ? -MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; - } -/* init default frame interval */ priv->frame_interval.numerator =1 ; priv->frame_interval.denominator =30 ;/* set a default mbus format */ imx_media_enum_ipu_format (&code,0 ,CS_SEL_YUV ); - ret =imx_media_init_mbus_fmt (&priv->format_mbus,640 ,480 , code, -V4L2_FIELD_NONE ,NULL ); -if (ret) -return ret; - -return media_entity_pads_init (&sd->entity,PRP_NUM_PADS , priv->pad); +return imx_media_init_mbus_fmt (&priv->format_mbus,640 ,480 , code, +V4L2_FIELD_NONE ,NULL ); }static const struct v4l2_subdev_pad_ops prp_pad_ops = {
@@ -487,6 +474,7 @@ static const struct v4l2_subdev_internal_ops prp_internal_ops = {static int prp_init (struct imx_ic_priv *ic_priv) {struct prp_priv *priv; +int i; priv =devm_kzalloc (ic_priv->ipu_dev,sizeof (*priv),GFP_KERNEL );if (!priv)
@@ -496,7 +484,12 @@ static int prp_init(struct imx_ic_priv *ic_priv) ic_priv->task_priv = priv; priv->ic_priv = ic_priv; -return 0 ; +for (i =0 ; i <PRP_NUM_PADS ; i++) + priv->pad[i].flags = (i ==PRP_SINK_PAD ) ? +MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; + +return media_entity_pads_init (&ic_priv->sd.entity,PRP_NUM_PADS , + priv->pad); }static void prp_remove (struct imx_ic_priv *ic_priv)
drivers/staging/media/imx/imx-ic-prpencvf.c +14 -14
@@ -1240,9 +1240,6 @@ static int prp_s_frame_interval(struct v4l2_subdev *sd,return 0 ; } -/* -* retrieve our pads parsed from the OF graph by the media device -*/ static int prp_registered (struct v4l2_subdev *sd) {struct prp_priv *priv =sd_to_priv (sd);
@@ -1250,12 +1247,9 @@ static int prp_registered(struct v4l2_subdev *sd)int i, ret;u32 code; +/* set a default mbus format */ +imx_media_enum_ipu_format (&code,0 ,CS_SEL_YUV );for (i =0 ; i <PRPENCVF_NUM_PADS ; i++) { - priv->pad[i].flags = (i ==PRPENCVF_SINK_PAD ) ? -MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; - -/* set a default mbus format */ -imx_media_enum_ipu_format (&code,0 ,CS_SEL_YUV ); ret =imx_media_init_mbus_fmt (&priv->format_mbus[i],640 ,480 , code,V4L2_FIELD_NONE , &priv->cc[i]);
@@ -1267,11 +1261,6 @@ static int prp_registered(struct v4l2_subdev *sd) priv->frame_interval.numerator =1 ; priv->frame_interval.denominator =30 ; - ret =media_entity_pads_init (&sd->entity,PRPENCVF_NUM_PADS , - priv->pad); -if (ret) -return ret; - priv->vdev =imx_media_capture_device_init (ic_priv->ipu_dev, &ic_priv->sd,PRPENCVF_SRC_PAD );
@@ -1337,6 +1326,7 @@ static const struct v4l2_subdev_internal_ops prp_internal_ops = {static int prp_init (struct imx_ic_priv *ic_priv) {struct prp_priv *priv; +int i, ret; priv =devm_kzalloc (ic_priv->ipu_dev,sizeof (*priv),GFP_KERNEL );if (!priv)
@@ -1350,7 +1340,17 @@ static int prp_init(struct imx_ic_priv *ic_priv)mutex_init (&priv->lock); -return 0 ; +for (i =0 ; i <PRPENCVF_NUM_PADS ; i++) { + priv->pad[i].flags = (i ==PRPENCVF_SINK_PAD ) ? +MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; + } + + ret =media_entity_pads_init (&ic_priv->sd.entity,PRPENCVF_NUM_PADS , + priv->pad); +if (ret) +mutex_destroy (&priv->lock); + +return ret; }static void prp_remove (struct imx_ic_priv *ic_priv)
drivers/staging/media/imx/imx-media-capture.c +8 -7
@@ -765,13 +765,6 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev)INIT_LIST_HEAD (&priv->ready_q); - priv->vdev_pad.flags =MEDIA_PAD_FL_SINK ; - ret =media_entity_pads_init (&vfd->entity,1 , &priv->vdev_pad); -if (ret) { -v4l2_err (sd,"failed to init dev pad\n" ); - goto unreg; - } -/* create the link from the src_sd devnode pad to device node */ ret =media_create_pad_link (&sd->entity, priv->src_sd_pad, &vfd->entity,0 ,0 );
@@ -834,6 +827,7 @@ imx_media_capture_device_init(struct device *dev, struct v4l2_subdev *src_sd, {struct capture_priv *priv;struct video_device *vfd; +int ret; priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL );if (!priv)
@@ -858,6 +852,13 @@ imx_media_capture_device_init(struct device *dev, struct v4l2_subdev *src_sd, vfd->queue = &priv->q; priv->vdev.vfd = vfd; + priv->vdev_pad.flags =MEDIA_PAD_FL_SINK ; + ret =media_entity_pads_init (&vfd->entity,1 , &priv->vdev_pad); +if (ret) { +video_device_release (vfd); +return ERR_PTR (ret); + } +INIT_LIST_HEAD (&priv->vdev.list);video_set_drvdata (vfd, priv);
drivers/staging/media/imx/imx-media-csi.c +10 -11
@@ -1740,9 +1740,6 @@ static int csi_unsubscribe_event(struct v4l2_subdev *sd, struct v4l2_fh *fh,return v4l2_event_unsubscribe (fh, sub); } -/* -* retrieve our pads parsed from the OF graph by the media device -*/ static int csi_registered (struct v4l2_subdev *sd) {struct csi_priv *priv =v4l2_get_subdevdata (sd);
@@ -1759,9 +1756,6 @@ static int csi_registered(struct v4l2_subdev *sd) priv->csi = csi;for (i =0 ; i <CSI_NUM_PADS ; i++) { - priv->pad[i].flags = (i ==CSI_SINK_PAD ) ? -MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; - code =0 ;if (i !=CSI_SINK_PAD )imx_media_enum_ipu_format (&code,0 ,CS_SEL_YUV );
@@ -1793,10 +1787,6 @@ static int csi_registered(struct v4l2_subdev *sd) goto put_csi; } - ret =media_entity_pads_init (&sd->entity,CSI_NUM_PADS , priv->pad); -if (ret) - goto free_fim; - priv->vdev =imx_media_capture_device_init (priv->sd.dev, &priv->sd,CSI_SRC_PAD_IDMAC );
@@ -1934,7 +1924,7 @@ static int imx_csi_probe(struct platform_device *pdev)struct ipu_client_platformdata *pdata;struct pinctrl *pinctrl;struct csi_priv *priv; -int ret; +int i, ret; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL );if (!priv)
@@ -1974,6 +1964,15 @@ 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)); +for (i =0 ; i <CSI_NUM_PADS ; i++) + priv->pad[i].flags = (i ==CSI_SINK_PAD ) ? +MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; + + ret =media_entity_pads_init (&priv->sd.entity,CSI_NUM_PADS , + priv->pad); +if (ret) +return ret; +mutex_init (&priv->lock);v4l2_ctrl_handler_init (&priv->ctrl_hdlr,0 );
drivers/staging/media/imx/imx-media-vdic.c +11 -16
@@ -841,9 +841,6 @@ static int vdic_s_frame_interval(struct v4l2_subdev *sd,return ret; } -/* -* retrieve our pads parsed from the OF graph by the media device -*/ static int vdic_registered (struct v4l2_subdev *sd) {struct vdic_priv *priv =v4l2_get_subdevdata (sd);
@@ -851,9 +848,6 @@ static int vdic_registered(struct v4l2_subdev *sd)u32 code;for (i =0 ; i <VDIC_NUM_PADS ; i++) { - priv->pad[i].flags = (i ==VDIC_SRC_PAD_DIRECT ) ? -MEDIA_PAD_FL_SOURCE :MEDIA_PAD_FL_SINK ; - code =0 ;if (i !=VDIC_SINK_PAD_IDMAC )imx_media_enum_ipu_format (&code,0 ,CS_SEL_YUV );
@@ -874,15 +868,7 @@ static int vdic_registered(struct v4l2_subdev *sd) priv->active_input_pad =VDIC_SINK_PAD_DIRECT ; - ret =vdic_init_controls (priv); -if (ret) -return ret; - - ret =media_entity_pads_init (&sd->entity,VDIC_NUM_PADS , priv->pad); -if (ret) -v4l2_ctrl_handler_free (&priv->ctrl_hdlr); - -return ret; +return vdic_init_controls (priv); }static void vdic_unregistered (struct v4l2_subdev *sd)
@@ -927,7 +913,7 @@ struct v4l2_subdev *imx_media_vdic_register(struct v4l2_device *v4l2_dev, u32 grp_id) {struct vdic_priv *priv; -int ret; +int i, ret; priv =devm_kzalloc (ipu_dev,sizeof (*priv),GFP_KERNEL );if (!priv)
@@ -949,6 +935,15 @@ struct v4l2_subdev *imx_media_vdic_register(struct v4l2_device *v4l2_dev,mutex_init (&priv->lock); +for (i =0 ; i <VDIC_NUM_PADS ; i++) + priv->pad[i].flags = (i ==VDIC_SRC_PAD_DIRECT ) ? +MEDIA_PAD_FL_SOURCE :MEDIA_PAD_FL_SINK ; + + ret =media_entity_pads_init (&priv->sd.entity,VDIC_NUM_PADS , + priv->pad); +if (ret) + goto free; + ret =v4l2_device_register_subdev (v4l2_dev, &priv->sd);if (ret) goto free;
drivers/staging/media/imx/imx6-mipi-csi2.c +12 -15
@@ -497,26 +497,13 @@ static int csi2_set_fmt(struct v4l2_subdev *sd,return ret; } -/* -* retrieve our pads parsed from the OF graph by the media device -*/ static int csi2_registered (struct v4l2_subdev *sd) {struct csi2_dev *csi2 =sd_to_dev (sd); -int i, ret; - -for (i =0 ; i <CSI2_NUM_PADS ; i++) { - csi2->pad[i].flags = (i ==CSI2_SINK_PAD ) ? -MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; - }/* set a default mbus format */ - ret =imx_media_init_mbus_fmt (&csi2->format_mbus, +return imx_media_init_mbus_fmt (&csi2->format_mbus,640 ,480 ,0 ,V4L2_FIELD_NONE ,NULL ); -if (ret) -return ret; - -return media_entity_pads_init (&sd->entity,CSI2_NUM_PADS , csi2->pad); }static const struct media_entity_operations csi2_entity_ops = {
@@ -573,7 +560,7 @@ static int csi2_probe(struct platform_device *pdev)unsigned int sink_port =0 ;struct csi2_dev *csi2;struct resource *res; -int ret; +int i, ret; csi2 =devm_kzalloc (&pdev->dev,sizeof (*csi2),GFP_KERNEL );if (!csi2)
@@ -592,6 +579,16 @@ static int csi2_probe(struct platform_device *pdev) csi2->sd.entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; csi2->sd.grp_id =IMX_MEDIA_GRP_ID_CSI2 ; +for (i =0 ; i <CSI2_NUM_PADS ; i++) { + csi2->pad[i].flags = (i ==CSI2_SINK_PAD ) ? +MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; + } + + ret =media_entity_pads_init (&csi2->sd.entity,CSI2_NUM_PADS , + csi2->pad); +if (ret) +return ret; + csi2->pllref_clk =devm_clk_get (&pdev->dev,"ref" );if (IS_ERR (csi2->pllref_clk)) {v4l2_err (&csi2->sd,"failed to get pll reference clock\n" );
drivers/staging/media/imx/imx7-media-csi.c +10 -8
@@ -1100,9 +1100,6 @@ static int imx7_csi_registered(struct v4l2_subdev *sd)int i;for (i =0 ; i <IMX7_CSI_PADS_NUM ; i++) { - csi->pad[i].flags = (i ==IMX7_CSI_PAD_SINK ) ? -MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; -/* set a default mbus format */ ret = imx_media_init_mbus_fmt(&csi->format_mbus[i], 800, 600, 0, V4L2_FIELD_NONE,
@@ -1115,10 +1112,6 @@ static int imx7_csi_registered(struct v4l2_subdev *sd) csi->frame_interval[i].denominator =30 ; } - ret =media_entity_pads_init (&sd->entity,IMX7_CSI_PADS_NUM , csi->pad); -if (ret <0 ) -return ret; - csi->vdev =imx_media_capture_device_init (csi->sd.dev, &csi->sd,IMX7_CSI_PAD_SRC );if (IS_ERR (csi->vdev))
@@ -1199,7 +1192,7 @@ static int imx7_csi_probe(struct platform_device *pdev)struct device_node *node = dev->of_node;struct imx_media_dev *imxmd;struct imx7_csi *csi; -int ret; +int i, ret; csi =devm_kzalloc (&pdev->dev,sizeof (*csi),GFP_KERNEL );if (!csi)
@@ -1266,6 +1259,15 @@ static int imx7_csi_probe(struct platform_device *pdev)v4l2_ctrl_handler_init (&csi->ctrl_hdlr,0 ); csi->sd.ctrl_handler = &csi->ctrl_hdlr; +for (i =0 ; i <IMX7_CSI_PADS_NUM ; i++) + csi->pad[i].flags = (i ==IMX7_CSI_PAD_SINK ) ? +MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; + + ret =media_entity_pads_init (&csi->sd.entity,IMX7_CSI_PADS_NUM , + csi->pad); +if (ret <0 ) + goto free; + ret = v4l2_async_register_fwnode_subdev(&csi->sd, sizeof(struct v4l2_async_subdev), NULL, 0,
drivers/staging/media/imx/imx7-mipi-csis.c +7 -16
@@ -780,17 +780,6 @@ static irqreturn_t mipi_csis_irq_handler(int irq, void *dev_id)return IRQ_HANDLED ; } -static int mipi_csis_registered (struct v4l2_subdev *mipi_sd) -{ -struct csi_state *state =mipi_sd_to_csis_state (mipi_sd); - - state->pads[CSIS_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; - state->pads[CSIS_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE ; - -return media_entity_pads_init (&state->mipi_sd.entity,CSIS_PADS_NUM , - state->pads); -} -static const struct v4l2_subdev_core_ops mipi_csis_core_ops = { .log_status = mipi_csis_log_status, };
@@ -816,10 +805,6 @@ static const struct v4l2_subdev_ops mipi_csis_subdev_ops = { .pad = &mipi_csis_pad_ops, }; -static const struct v4l2_subdev_internal_ops mipi_csis_internal_ops = { - .registered = mipi_csis_registered, -}; -static int mipi_csis_parse_dt (struct platform_device *pdev,struct csi_state *state) {
@@ -880,7 +865,6 @@ static int mipi_csis_subdev_init(struct v4l2_subdev *mipi_sd, mipi_sd->entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; mipi_sd->entity.ops = &mipi_csis_entity_ops; - mipi_sd->internal_ops = &mipi_csis_internal_ops; mipi_sd->dev = &pdev->dev;
@@ -892,6 +876,13 @@ static int mipi_csis_subdev_init(struct v4l2_subdev *mipi_sd,v4l2_set_subdevdata (mipi_sd, &pdev->dev); + state->pads[CSIS_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; + state->pads[CSIS_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE ; + ret =media_entity_pads_init (&mipi_sd->entity,CSIS_PADS_NUM , + state->pads); +if (ret) +return ret; + ret = v4l2_async_register_fwnode_subdev(mipi_sd, sizeof(struct v4l2_async_subdev), &sink_port, 1,
Signature · 1 line
2.17.1
Hi Steve,
Quoted 22 lines · Steve Longerbeam
If the media device module is removed and re-probed without also removing and re-probing the subdevice modules, .unregister() and .register() ops are called on the subdevices without the subdevice drivers being removed and re-probed. This creates two problems:
- the CSI and PRPENCVF subdevices attempt to register a stale video capture device resulting in the kobject "tried to init an initialized object" backtrace.
- pad graph objects are added to the media device pad list twice, resulting in list corruption on the pad list.
The following two patches fix those issues.
History:
v2:
- Add missing local varic_privinprp_registered()in first patch.Steve Longerbeam (2):
media: imx: Move capture device init to registered
media: imx: Move pads init to probe
Quoted 9 lines
drivers/staging/media/imx/imx-ic-prp.c | 25 ++++----- drivers/staging/media/imx/imx-ic-prpencvf.c | 51 ++++++++++--------- drivers/staging/media/imx/imx-media-capture.c | 15 +++--- drivers/staging/media/imx/imx-media-csi.c | 35 +++++++------ drivers/staging/media/imx/imx-media-vdic.c | 27 ++++------ drivers/staging/media/imx/imx6-mipi-csi2.c | 27 +++++----- drivers/staging/media/imx/imx7-media-csi.c | 38 +++++++------- drivers/staging/media/imx/imx7-mipi-csis.c | 23 +++------
For the imx7 parts:
Many thanks for this.
Cheers,
Rui