[PATCH 0/3] media: imx8mq-mipi-csi2: Simplify power management handling

[PATCH 0/3] media: imx8mq-mipi-csi2: Simplify power management handling

[Laurent Pinchart]

Hello,

This small patch series is a reaction to "[PATCH] media: nxp:
imx8mq-mipi-csi2: Fix CSI clocks always enabled issue" ([1]). Instead of
making the PM handling more complex, I think it can be greatly
simplified.

I have only compile-tested the patches. Guoniu, could you give this a
try ?

https://lore.kernel.org/r/20240929101635.1648234-1-guoniu.zhou@oss.nxp.com

Laurent Pinchart (3):
  media: imx8mq-mipi-csi2: Drop stream stop/restart at suspend/resume
    time
  media: imx8mq-mipi-csi2: Drop ST_SUSPENDED guard
  media: imx8mq-mipi-csi2: Drop system suspend/resume handlers

 drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 113 ++----------------
 1 file changed, 10 insertions(+), 103 deletions(-)


base-commit: 81ee62e8d09ee3c7107d11c8bbfd64073ab601ad
-- 
Regards,

Laurent Pinchart

[PATCH 0/3] media: imx8mq-mipi-csi2: Simplify power management handling

[Laurent Pinchart]

Hello,

This small patch series is a reaction to "[PATCH] media: nxp:
imx8mq-mipi-csi2: Fix CSI clocks always enabled issue" ([1]). Instead of
making the PM handling more complex, I think it can be greatly
simplified.

I have only compile-tested the patches. Guoniu, could you give this a
try ?

[1] https://lore.kernel.org/r/20240929101635.1648234-1-guoniu.zhou@oss.nxp.com

Laurent Pinchart (3):
  media: imx8mq-mipi-csi2: Drop stream stop/restart at suspend/resume
    time
  media: imx8mq-mipi-csi2: Drop ST_SUSPENDED guard
  media: imx8mq-mipi-csi2: Drop system suspend/resume handlers

 drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 113 ++----------------
 1 file changed, 10 insertions(+), 103 deletions(-)


base-commit: 81ee62e8d09ee3c7107d11c8bbfd64073ab601ad
-- 
Regards,

Laurent Pinchart

[PATCH 1/3] media: imx8mq-mipi-csi2: Drop stream stop/restart at suspend/resume time

[Laurent Pinchart]

The imx8mq-mipi-csi2 driver stops streaming at suspend time, and
restarts it at resume time, in both the runtime and system
suspend/resume handlers. This isn't needed:

- The device is runtime resumed only from the .s_stream() handler,
  before starting streaming, and runtime suspended in the same function,
  after stopping streaming.

- For system suspend/resume, the whole capture pipeline is stopped and
  restarted in a controlled manner by the top-level driver (the CSI
  bridge in this case). When the system suspend handler is called,
  streaming will have been stopped already.

Drop stream stop/restart from the PM handlers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
index d4a6c5532969..8eb9c7049425 100644
--- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
+++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
@@ -64,7 +64,6 @@
 
 enum {
 	ST_POWERED	= 1,
-	ST_STREAMING	= 2,
 	ST_SUSPENDED	= 4,
 };
 
@@ -420,12 +419,9 @@ static int imx8mq_mipi_csi_s_stream(struct v4l2_subdev *sd, int enable)
 		ret = v4l2_subdev_call(state->src_sd, video, s_stream, 1);
 		if (ret < 0)
 			goto unlock;
-
-		state->state |= ST_STREAMING;
 	} else {
 		v4l2_subdev_call(state->src_sd, video, s_stream, 0);
 		imx8mq_mipi_csi_stop_stream(state);
-		state->state &= ~ST_STREAMING;
 	}
 
 unlock:
@@ -668,7 +664,6 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev)
 {
 	struct v4l2_subdev *sd = dev_get_drvdata(dev);
 	struct csi_state *state = mipi_sd_to_csi2_state(sd);
-	struct v4l2_subdev_state *sd_state;
 	int ret = 0;
 
 	mutex_lock(&state->lock);
@@ -677,17 +672,9 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev)
 		state->state |= ST_POWERED;
 		ret = imx8mq_mipi_csi_clk_enable(state);
 	}
-	if (state->state & ST_STREAMING) {
-		sd_state = v4l2_subdev_lock_and_get_active_state(sd);
-		ret = imx8mq_mipi_csi_start_stream(state, sd_state);
-		v4l2_subdev_unlock_state(sd_state);
-		if (ret)
-			goto unlock;
-	}
 
 	state->state &= ~ST_SUSPENDED;
 
-unlock:
 	mutex_unlock(&state->lock);
 
 	return ret ? -EAGAIN : 0;
-- 
Regards,

Laurent Pinchart

[PATCH 2/3] media: imx8mq-mipi-csi2: Drop ST_SUSPENDED guard

[Laurent Pinchart]

The ST_SUSPENDED flag is set at system suspend and cleared at either
system resume or runtime resume. It is then used in two locations:

- In .s_stream(), when starting the stream to return -EBUSY if the
  device is suspended. This can't happen, As the function calls
  pm_runtime_resume_and_get() just before the check, which clears the
  ST_SUSPENDED flag.

- In imx8mq_mipi_csi_resume() to skip resuming if the device isn't
  suspended. As imx8mq_mipi_csi_resume() is the system resume handler,
  the device is by definition suspended.

The ST_SUSPENDED flag is therefore not needed. Drop it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
index 8eb9c7049425..0f56a40abf33 100644
--- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
+++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
@@ -64,7 +64,6 @@
 
 enum {
 	ST_POWERED	= 1,
-	ST_SUSPENDED	= 4,
 };
 
 enum imx8mq_mipi_csi_clk {
@@ -404,11 +403,6 @@ static int imx8mq_mipi_csi_s_stream(struct v4l2_subdev *sd, int enable)
 	mutex_lock(&state->lock);
 
 	if (enable) {
-		if (state->state & ST_SUSPENDED) {
-			ret = -EBUSY;
-			goto unlock;
-		}
-
 		sd_state = v4l2_subdev_lock_and_get_active_state(sd);
 		ret = imx8mq_mipi_csi_start_stream(state, sd_state);
 		v4l2_subdev_unlock_state(sd_state);
@@ -673,8 +667,6 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev)
 		ret = imx8mq_mipi_csi_clk_enable(state);
 	}
 
-	state->state &= ~ST_SUSPENDED;
-
 	mutex_unlock(&state->lock);
 
 	return ret ? -EAGAIN : 0;
@@ -682,24 +674,13 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev)
 
 static int imx8mq_mipi_csi_suspend(struct device *dev)
 {
-	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-	struct csi_state *state = mipi_sd_to_csi2_state(sd);
-
 	imx8mq_mipi_csi_pm_suspend(dev);
 
-	state->state |= ST_SUSPENDED;
-
 	return 0;
 }
 
 static int imx8mq_mipi_csi_resume(struct device *dev)
 {
-	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-	struct csi_state *state = mipi_sd_to_csi2_state(sd);
-
-	if (!(state->state & ST_SUSPENDED))
-		return 0;
-
 	return imx8mq_mipi_csi_pm_resume(dev);
 }
 
-- 
Regards,

Laurent Pinchart

[PATCH 3/3] media: imx8mq-mipi-csi2: Drop system suspend/resume handlers

[Laurent Pinchart]

Video capture pipelines are suspended and resumes in a controlled
manner by the top-level driver (the CSI bridge driver in this case), to
ensure proper synchronization of sources and sinks. There is therefore
no need for system suspend/resume handlers in the imx8mq-mipi-csi2
driver. Drop them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 81 +++----------------
 1 file changed, 10 insertions(+), 71 deletions(-)

diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
index 0f56a40abf33..54b2de09692b 100644
--- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
+++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
@@ -15,7 +15,6 @@
 #include <linux/kernel.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
-#include <linux/mutex.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
@@ -62,10 +61,6 @@
 #define CSI2RX_CFG_VID_P_FIFO_SEND_LEVEL	0x188
 #define CSI2RX_CFG_DISABLE_PAYLOAD_1		0x130
 
-enum {
-	ST_POWERED	= 1,
-};
-
 enum imx8mq_mipi_csi_clk {
 	CSI2_CLK_CORE,
 	CSI2_CLK_ESC,
@@ -116,9 +111,6 @@ struct csi_state {
 
 	struct v4l2_mbus_config_mipi_csi2 bus;
 
-	struct mutex lock; /* Protect state */
-	u32 state;
-
 	struct regmap *phy_gpr;
 	u8 phy_gpr_reg;
 
@@ -400,27 +392,23 @@ static int imx8mq_mipi_csi_s_stream(struct v4l2_subdev *sd, int enable)
 			return ret;
 	}
 
-	mutex_lock(&state->lock);
-
 	if (enable) {
 		sd_state = v4l2_subdev_lock_and_get_active_state(sd);
 		ret = imx8mq_mipi_csi_start_stream(state, sd_state);
 		v4l2_subdev_unlock_state(sd_state);
 
 		if (ret < 0)
-			goto unlock;
+			goto out;
 
 		ret = v4l2_subdev_call(state->src_sd, video, s_stream, 1);
 		if (ret < 0)
-			goto unlock;
+			goto out;
 	} else {
 		v4l2_subdev_call(state->src_sd, video, s_stream, 0);
 		imx8mq_mipi_csi_stop_stream(state);
 	}
 
-unlock:
-	mutex_unlock(&state->lock);
-
+out:
 	if (!enable || ret < 0)
 		pm_runtime_put(state->dev);
 
@@ -638,59 +626,14 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state)
  * Suspend/resume
  */
 
-static void imx8mq_mipi_csi_pm_suspend(struct device *dev)
-{
-	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-	struct csi_state *state = mipi_sd_to_csi2_state(sd);
-
-	mutex_lock(&state->lock);
-
-	if (state->state & ST_POWERED) {
-		imx8mq_mipi_csi_stop_stream(state);
-		imx8mq_mipi_csi_clk_disable(state);
-		state->state &= ~ST_POWERED;
-	}
-
-	mutex_unlock(&state->lock);
-}
-
-static int imx8mq_mipi_csi_pm_resume(struct device *dev)
-{
-	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-	struct csi_state *state = mipi_sd_to_csi2_state(sd);
-	int ret = 0;
-
-	mutex_lock(&state->lock);
-
-	if (!(state->state & ST_POWERED)) {
-		state->state |= ST_POWERED;
-		ret = imx8mq_mipi_csi_clk_enable(state);
-	}
-
-	mutex_unlock(&state->lock);
-
-	return ret ? -EAGAIN : 0;
-}
-
-static int imx8mq_mipi_csi_suspend(struct device *dev)
-{
-	imx8mq_mipi_csi_pm_suspend(dev);
-
-	return 0;
-}
-
-static int imx8mq_mipi_csi_resume(struct device *dev)
-{
-	return imx8mq_mipi_csi_pm_resume(dev);
-}
-
 static int imx8mq_mipi_csi_runtime_suspend(struct device *dev)
 {
 	struct v4l2_subdev *sd = dev_get_drvdata(dev);
 	struct csi_state *state = mipi_sd_to_csi2_state(sd);
 	int ret;
 
-	imx8mq_mipi_csi_pm_suspend(dev);
+	imx8mq_mipi_csi_stop_stream(state);
+	imx8mq_mipi_csi_clk_disable(state);
 
 	ret = icc_set_bw(state->icc_path, 0, 0);
 	if (ret)
@@ -711,13 +654,14 @@ static int imx8mq_mipi_csi_runtime_resume(struct device *dev)
 		return ret;
 	}
 
-	return imx8mq_mipi_csi_pm_resume(dev);
+	ret = imx8mq_mipi_csi_clk_enable(state);
+
+	return ret ? -EAGAIN : 0;
 }
 
 static const struct dev_pm_ops imx8mq_mipi_csi_pm_ops = {
 	RUNTIME_PM_OPS(imx8mq_mipi_csi_runtime_suspend,
 		       imx8mq_mipi_csi_runtime_resume, NULL)
-	SYSTEM_SLEEP_PM_OPS(imx8mq_mipi_csi_suspend, imx8mq_mipi_csi_resume)
 };
 
 /* -----------------------------------------------------------------------------
@@ -854,15 +798,13 @@ static int imx8mq_mipi_csi_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, &state->sd);
 
-	mutex_init(&state->lock);
-
 	ret = imx8mq_mipi_csi_subdev_init(state);
 	if (ret < 0)
-		goto mutex;
+		return ret;
 
 	ret = imx8mq_mipi_csi_init_icc(pdev);
 	if (ret)
-		goto mutex;
+		return ret;
 
 	/* Enable runtime PM. */
 	pm_runtime_enable(dev);
@@ -889,8 +831,6 @@ static int imx8mq_mipi_csi_probe(struct platform_device *pdev)
 	v4l2_async_unregister_subdev(&state->sd);
 icc:
 	imx8mq_mipi_csi_release_icc(pdev);
-mutex:
-	mutex_destroy(&state->lock);
 
 	return ret;
 }
@@ -908,7 +848,6 @@ static void imx8mq_mipi_csi_remove(struct platform_device *pdev)
 	imx8mq_mipi_csi_runtime_suspend(&pdev->dev);
 	media_entity_cleanup(&state->sd.entity);
 	v4l2_subdev_cleanup(&state->sd);
-	mutex_destroy(&state->lock);
 	pm_runtime_set_suspended(&pdev->dev);
 	imx8mq_mipi_csi_release_icc(pdev);
 }
-- 
Regards,

Laurent Pinchart

RE: [PATCH 0/3] media: imx8mq-mipi-csi2: Simplify power management handling

[G.N. Zhou (OSS)]

Hi Laurent,

> -----Original Message-----
> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Sent: Sunday, September 29, 2024 9:44 PM
> To: rmfrfs@gmail.com; martink@posteo.de; kernel@puri.sm;
> mchehab@kernel.org; shawnguo@kernel.org; s.hauer@pengutronix.de;
> kernel@pengutronix.de; festevam@gmail.com
> Cc: G.N. Zhou (OSS) <guoniu.zhou@oss.nxp.com>; imx@lists.linux.dev; linux-
> media@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-
> kernel@vger.kernel.org
> Subject: [PATCH 0/3] media: imx8mq-mipi-csi2: Simplify power management
> handling
> 
> Hello,
> 
> This small patch series is a reaction to "[PATCH] media: nxp:
> imx8mq-mipi-csi2: Fix CSI clocks always enabled issue" ([1]). Instead of making
> the PM handling more complex, I think it can be greatly simplified.
> 
> I have only compile-tested the patches. Guoniu, could you give this a try ?

After applying the patches and test both on iMX8ULP.

  For iMX8ULP, it will cause kernel dump when access CSI registers and system hang during do suspend/resume while streaming
  Need to add system suspend/resume handlers and call pm_runtime_force_suspend/resume in the handlers.
  
  I tried to debug this issue and found pm runtime callback won't be called when system resume. The state of power domain won't
  enabled.

> 
> [1] https://lore.kernel.org/r/20240929101635.1648234-1-
> guoniu.zhou@oss.nxp.com
> 
> Laurent Pinchart (3):
>   media: imx8mq-mipi-csi2: Drop stream stop/restart at suspend/resume
>     time
>   media: imx8mq-mipi-csi2: Drop ST_SUSPENDED guard
>   media: imx8mq-mipi-csi2: Drop system suspend/resume handlers
> 
>  drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 113 ++----------------
>  1 file changed, 10 insertions(+), 103 deletions(-)
> 
> 
> base-commit: 81ee62e8d09ee3c7107d11c8bbfd64073ab601ad
> --
> Regards,
> 
> Laurent Pinchart

Re: [PATCH 0/3] media: imx8mq-mipi-csi2: Simplify power management handling

[Laurent Pinchart]

On Mon, Sep 30, 2024 at 07:08:09AM +0000, G.N. Zhou (OSS) wrote:
> On Sunday, September 29, 2024 9:44 PM, Laurent Pinchart wrote:
> > 
> > Hello,
> > 
> > This small patch series is a reaction to "[PATCH] media: nxp:
> > imx8mq-mipi-csi2: Fix CSI clocks always enabled issue" ([1]). Instead of making
> > the PM handling more complex, I think it can be greatly simplified.
> > 
> > I have only compile-tested the patches. Guoniu, could you give this a try ?
> 
> After applying the patches and test both on iMX8ULP.
> 
> For iMX8ULP, it will cause kernel dump when access CSI registers and
> system hang during do suspend/resume while streaming
> Need to add system suspend/resume handlers and call
> pm_runtime_force_suspend/resume in the handlers.
> 
> I tried to debug this issue and found pm runtime callback won't be
> called when system resume. The state of power domain won't enabled.

Thank you for testing.

I wonder if this could be caused by the CSI bridge being resumed from
system sleep before the CSI-2 receiver. Could you check if that's the
case ? If so, does the following change fix the issue ?

diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c
index 9566ff738818..c66b0621e395 100644
--- a/drivers/media/platform/nxp/imx7-media-csi.c
+++ b/drivers/media/platform/nxp/imx7-media-csi.c
@@ -2057,9 +2057,22 @@ static int imx7_csi_notify_bound(struct v4l2_async_notifier *notifier,
 {
 	struct imx7_csi *csi = imx7_csi_notifier_to_dev(notifier);
 	struct media_pad *sink = &csi->sd.entity.pads[IMX7_CSI_PAD_SINK];
+	struct device_link *link;
 
 	csi->src_sd = sd;
 
+	/*
+	 * Enforce suspend/resume ordering between the source (supplier) and
+	 * the CSI (consumer). The source will be suspended before and resume
+	 * after the CSI.
+	 */
+	link = device_link_add(csi->dev, sd->dev, DL_FLAG_STATELESS);
+	if (!link) {
+		dev_err(csi->dev,
+			"Failed to create device link to source %s\n", sd->name);
+		return -EINVAL;
+	}
+
 	return v4l2_create_fwnode_links_to_pad(sd, sink, MEDIA_LNK_FL_ENABLED |
 					       MEDIA_LNK_FL_IMMUTABLE);
 }

> > [1] https://lore.kernel.org/r/20240929101635.1648234-1-guoniu.zhou@oss.nxp.com
> > 
> > Laurent Pinchart (3):
> >   media: imx8mq-mipi-csi2: Drop stream stop/restart at suspend/resume
> >     time
> >   media: imx8mq-mipi-csi2: Drop ST_SUSPENDED guard
> >   media: imx8mq-mipi-csi2: Drop system suspend/resume handlers
> > 
> >  drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 113 ++----------------
> >  1 file changed, 10 insertions(+), 103 deletions(-)
> > 
> > 
> > base-commit: 81ee62e8d09ee3c7107d11c8bbfd64073ab601ad

-- 
Regards,

Laurent Pinchart

RE: [PATCH 0/3] media: imx8mq-mipi-csi2: Simplify power management handling

[G.N. Zhou (OSS)]

Hi Laurent,

> -----Original Message-----
> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Sent: Monday, September 30, 2024 3:22 PM
> To: G.N. Zhou (OSS) <guoniu.zhou@oss.nxp.com>
> Cc: rmfrfs@gmail.com; martink@posteo.de; kernel@puri.sm;
> mchehab@kernel.org; shawnguo@kernel.org; s.hauer@pengutronix.de;
> kernel@pengutronix.de; festevam@gmail.com; imx@lists.linux.dev; linux-
> media@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-
> kernel@vger.kernel.org
> Subject: Re: [PATCH 0/3] media: imx8mq-mipi-csi2: Simplify power management
> handling
> 
> On Mon, Sep 30, 2024 at 07:08:09AM +0000, G.N. Zhou (OSS) wrote:
> > On Sunday, September 29, 2024 9:44 PM, Laurent Pinchart wrote:
> > >
> > > Hello,
> > >
> > > This small patch series is a reaction to "[PATCH] media: nxp:
> > > imx8mq-mipi-csi2: Fix CSI clocks always enabled issue" ([1]).
> > > Instead of making the PM handling more complex, I think it can be greatly
> simplified.
> > >
> > > I have only compile-tested the patches. Guoniu, could you give this a try ?
> >
> > After applying the patches and test both on iMX8ULP.
> >
> > For iMX8ULP, it will cause kernel dump when access CSI registers and
> > system hang during do suspend/resume while streaming Need to add
> > system suspend/resume handlers and call
> > pm_runtime_force_suspend/resume in the handlers.
> >
> > I tried to debug this issue and found pm runtime callback won't be
> > called when system resume. The state of power domain won't enabled.
> 
> Thank you for testing.
> 
> I wonder if this could be caused by the CSI bridge being resumed from system
> sleep before the CSI-2 receiver. Could you check if that's the case ? If so, does the
> following change fix the issue ?

I tested on iMX8ULP which don't use CSI bridge but ISI, not iMX8MQ. In ISI driver, I notice that
it already handler the device relationship when subdev bound like bellow:

link = device_link_add(isi->dev, sd->dev, DL_FLAG_STATELESS);
if (!link) {
        dev_err(isi->dev,
                "Failed to create device link to source %s\n", sd->name);
        return -EINVAL;
}

For iMX8MQ, I'm trying to enable it, but meet some problems, so can't give you the results in short time.

> 
> diff --git a/drivers/media/platform/nxp/imx7-media-csi.c
> b/drivers/media/platform/nxp/imx7-media-csi.c
> index 9566ff738818..c66b0621e395 100644
> --- a/drivers/media/platform/nxp/imx7-media-csi.c
> +++ b/drivers/media/platform/nxp/imx7-media-csi.c
> @@ -2057,9 +2057,22 @@ static int imx7_csi_notify_bound(struct
> v4l2_async_notifier *notifier,  {
>  	struct imx7_csi *csi = imx7_csi_notifier_to_dev(notifier);
>  	struct media_pad *sink = &csi->sd.entity.pads[IMX7_CSI_PAD_SINK];
> +	struct device_link *link;
> 
>  	csi->src_sd = sd;
> 
> +	/*
> +	 * Enforce suspend/resume ordering between the source (supplier) and
> +	 * the CSI (consumer). The source will be suspended before and resume
> +	 * after the CSI.
> +	 */
> +	link = device_link_add(csi->dev, sd->dev, DL_FLAG_STATELESS);
> +	if (!link) {
> +		dev_err(csi->dev,
> +			"Failed to create device link to source %s\n", sd->name);
> +		return -EINVAL;
> +	}
> +
>  	return v4l2_create_fwnode_links_to_pad(sd, sink,
> MEDIA_LNK_FL_ENABLED |
>  					       MEDIA_LNK_FL_IMMUTABLE);
>  }
> 
> > > [1]
> > > https://lore.kernel.org/r/20240929101635.1648234-1-guoniu.zhou@oss.n
> > > xp.com
> > >
> > > Laurent Pinchart (3):
> > >   media: imx8mq-mipi-csi2: Drop stream stop/restart at suspend/resume
> > >     time
> > >   media: imx8mq-mipi-csi2: Drop ST_SUSPENDED guard
> > >   media: imx8mq-mipi-csi2: Drop system suspend/resume handlers
> > >
> > >  drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 113
> > > ++----------------
> > >  1 file changed, 10 insertions(+), 103 deletions(-)
> > >
> > >
> > > base-commit: 81ee62e8d09ee3c7107d11c8bbfd64073ab601ad
> 
> --
> Regards,
> 
> Laurent Pinchart

Re: [PATCH 0/3] media: imx8mq-mipi-csi2: Simplify power management handling

[Martin Kepplinger]

Am Montag, dem 30.09.2024 um 10:21 +0300 schrieb Laurent Pinchart:
> On Mon, Sep 30, 2024 at 07:08:09AM +0000, G.N. Zhou (OSS) wrote:
> > On Sunday, September 29, 2024 9:44 PM, Laurent Pinchart wrote:
> > > 
> > > Hello,
> > > 
> > > This small patch series is a reaction to "[PATCH] media: nxp:
> > > imx8mq-mipi-csi2: Fix CSI clocks always enabled issue" ([1]).
> > > Instead of making
> > > the PM handling more complex, I think it can be greatly
> > > simplified.
> > > 
> > > I have only compile-tested the patches. Guoniu, could you give
> > > this a try ?
> > 
> > After applying the patches and test both on iMX8ULP.
> > 
> > For iMX8ULP, it will cause kernel dump when access CSI registers
> > and
> > system hang during do suspend/resume while streaming
> > Need to add system suspend/resume handlers and call
> > pm_runtime_force_suspend/resume in the handlers.
> > 
> > I tried to debug this issue and found pm runtime callback won't be
> > called when system resume. The state of power domain won't enabled.
> 
> Thank you for testing.
> 
> I wonder if this could be caused by the CSI bridge being resumed from
> system sleep before the CSI-2 receiver. Could you check if that's the
> case ? If so, does the following change fix the issue ?
> 
> diff --git a/drivers/media/platform/nxp/imx7-media-csi.c
> b/drivers/media/platform/nxp/imx7-media-csi.c
> index 9566ff738818..c66b0621e395 100644
> --- a/drivers/media/platform/nxp/imx7-media-csi.c
> +++ b/drivers/media/platform/nxp/imx7-media-csi.c
> @@ -2057,9 +2057,22 @@ static int imx7_csi_notify_bound(struct
> v4l2_async_notifier *notifier,
>  {
>         struct imx7_csi *csi = imx7_csi_notifier_to_dev(notifier);
>         struct media_pad *sink = &csi-
> >sd.entity.pads[IMX7_CSI_PAD_SINK];
> +       struct device_link *link;
>  
>         csi->src_sd = sd;
>  
> +       /*
> +        * Enforce suspend/resume ordering between the source
> (supplier) and
> +        * the CSI (consumer). The source will be suspended before
> and resume
> +        * after the CSI.
> +        */
> +       link = device_link_add(csi->dev, sd->dev, DL_FLAG_STATELESS);
> +       if (!link) {
> +               dev_err(csi->dev,
> +                       "Failed to create device link to source
> %s\n", sd->name);
> +               return -EINVAL;
> +       }
> +
>         return v4l2_create_fwnode_links_to_pad(sd, sink,
> MEDIA_LNK_FL_ENABLED |
>                                               
> MEDIA_LNK_FL_IMMUTABLE);
>  }


hi Laurent,

I now tested your 3 patches, initially including this extra change, on
the imx8mq Librem 5 and indeed streaming continues after system resume
now. It works without this extra change too, even though it seems to
make sense.

so for the 3-patch series at least:

Tested-by: Martin Kepplinger-Novaković <martink@posteo.de>

thanks. I seem to be able to drop a few patches now, but if anyone else
can test it too, please wait for that as well,

                              martin

Re: [PATCH 0/3] media: imx8mq-mipi-csi2: Simplify power management handling

[Laurent Pinchart]

Hi Guo,

On Mon, Sep 30, 2024 at 07:51:45AM +0000, G.N. Zhou (OSS) wrote:
> On Monday, September 30, 2024 3:22 PM, Laurent Pinchart wrote:
> > On Mon, Sep 30, 2024 at 07:08:09AM +0000, G.N. Zhou (OSS) wrote:
> > > On Sunday, September 29, 2024 9:44 PM, Laurent Pinchart wrote:
> > > >
> > > > Hello,
> > > >
> > > > This small patch series is a reaction to "[PATCH] media: nxp:
> > > > imx8mq-mipi-csi2: Fix CSI clocks always enabled issue" ([1]).
> > > > Instead of making the PM handling more complex, I think it can be greatly simplified.
> > > >
> > > > I have only compile-tested the patches. Guoniu, could you give this a try ?
> > >
> > > After applying the patches and test both on iMX8ULP.
> > >
> > > For iMX8ULP, it will cause kernel dump when access CSI registers and
> > > system hang during do suspend/resume while streaming Need to add
> > > system suspend/resume handlers and call
> > > pm_runtime_force_suspend/resume in the handlers.
> > >
> > > I tried to debug this issue and found pm runtime callback won't be
> > > called when system resume. The state of power domain won't enabled.
> > 
> > Thank you for testing.
> > 
> > I wonder if this could be caused by the CSI bridge being resumed from system
> > sleep before the CSI-2 receiver. Could you check if that's the case ? If so, does the
> > following change fix the issue ?
> 
> I tested on iMX8ULP which don't use CSI bridge but ISI, not iMX8MQ. In ISI driver, I notice that
> it already handler the device relationship when subdev bound like bellow:
> 
> link = device_link_add(isi->dev, sd->dev, DL_FLAG_STATELESS);
> if (!link) {
>         dev_err(isi->dev,
>                 "Failed to create device link to source %s\n", sd->name);
>         return -EINVAL;
> }

Ah yes indeed with the ISI it should already be handled.

I can't test this on hardware now as I'm travelling. Is the system hang
happening at suspend or resume time ? What is the order of the
suspend/resume handlers calls for the imx8-isi driver and the
imx8mq-mipi-csi2 driver ?

> For iMX8MQ, I'm trying to enable it, but meet some problems, so can't
> give you the results in short time.
> 
> > diff --git a/drivers/media/platform/nxp/imx7-media-csi.c
> > b/drivers/media/platform/nxp/imx7-media-csi.c
> > index 9566ff738818..c66b0621e395 100644
> > --- a/drivers/media/platform/nxp/imx7-media-csi.c
> > +++ b/drivers/media/platform/nxp/imx7-media-csi.c
> > @@ -2057,9 +2057,22 @@ static int imx7_csi_notify_bound(struct
> > v4l2_async_notifier *notifier,  {
> >  	struct imx7_csi *csi = imx7_csi_notifier_to_dev(notifier);
> >  	struct media_pad *sink = &csi->sd.entity.pads[IMX7_CSI_PAD_SINK];
> > +	struct device_link *link;
> > 
> >  	csi->src_sd = sd;
> > 
> > +	/*
> > +	 * Enforce suspend/resume ordering between the source (supplier) and
> > +	 * the CSI (consumer). The source will be suspended before and resume
> > +	 * after the CSI.
> > +	 */
> > +	link = device_link_add(csi->dev, sd->dev, DL_FLAG_STATELESS);
> > +	if (!link) {
> > +		dev_err(csi->dev,
> > +			"Failed to create device link to source %s\n", sd->name);
> > +		return -EINVAL;
> > +	}
> > +
> >  	return v4l2_create_fwnode_links_to_pad(sd, sink, MEDIA_LNK_FL_ENABLED |
> >  					       MEDIA_LNK_FL_IMMUTABLE);
> >  }
> > 
> > > > [1] https://lore.kernel.org/r/20240929101635.1648234-1-guoniu.zhou@oss.nxp.com
> > > >
> > > > Laurent Pinchart (3):
> > > >   media: imx8mq-mipi-csi2: Drop stream stop/restart at suspend/resume time
> > > >   media: imx8mq-mipi-csi2: Drop ST_SUSPENDED guard
> > > >   media: imx8mq-mipi-csi2: Drop system suspend/resume handlers
> > > >
> > > >  drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 113 ++----------------
> > > >  1 file changed, 10 insertions(+), 103 deletions(-)
> > > >
> > > >
> > > > base-commit: 81ee62e8d09ee3c7107d11c8bbfd64073ab601ad

-- 
Regards,

Laurent Pinchart

RE: [PATCH 0/3] media: imx8mq-mipi-csi2: Simplify power management handling

[G.N. Zhou (OSS)]

Hi Laruent,

> -----Original Message-----
> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Sent: Tuesday, October 8, 2024 5:44 AM
> To: G.N. Zhou (OSS) <guoniu.zhou@oss.nxp.com>
> Cc: rmfrfs@gmail.com; martink@posteo.de; kernel@puri.sm;
> mchehab@kernel.org; shawnguo@kernel.org; s.hauer@pengutronix.de;
> kernel@pengutronix.de; festevam@gmail.com; imx@lists.linux.dev; linux-
> media@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-
> kernel@vger.kernel.org
> Subject: Re: [PATCH 0/3] media: imx8mq-mipi-csi2: Simplify power
> management handling
> 
> Hi Guo,
> 
> On Mon, Sep 30, 2024 at 07:51:45AM +0000, G.N. Zhou (OSS) wrote:
> > On Monday, September 30, 2024 3:22 PM, Laurent Pinchart wrote:
> > > On Mon, Sep 30, 2024 at 07:08:09AM +0000, G.N. Zhou (OSS) wrote:
> > > > On Sunday, September 29, 2024 9:44 PM, Laurent Pinchart wrote:
> > > > >
> > > > > Hello,
> > > > >
> > > > > This small patch series is a reaction to "[PATCH] media: nxp:
> > > > > imx8mq-mipi-csi2: Fix CSI clocks always enabled issue" ([1]).
> > > > > Instead of making the PM handling more complex, I think it can be
> greatly simplified.
> > > > >
> > > > > I have only compile-tested the patches. Guoniu, could you give this a
> try ?
> > > >
> > > > After applying the patches and test both on iMX8ULP.
> > > >
> > > > For iMX8ULP, it will cause kernel dump when access CSI registers
> > > > and system hang during do suspend/resume while streaming Need to
> > > > add system suspend/resume handlers and call
> > > > pm_runtime_force_suspend/resume in the handlers.
> > > >
> > > > I tried to debug this issue and found pm runtime callback won't be
> > > > called when system resume. The state of power domain won't enabled.
> > >
> > > Thank you for testing.
> > >
> > > I wonder if this could be caused by the CSI bridge being resumed
> > > from system sleep before the CSI-2 receiver. Could you check if
> > > that's the case ? If so, does the following change fix the issue ?
> >
> > I tested on iMX8ULP which don't use CSI bridge but ISI, not iMX8MQ. In
> > ISI driver, I notice that it already handler the device relationship when subdev
> bound like bellow:
> >
> > link = device_link_add(isi->dev, sd->dev, DL_FLAG_STATELESS); if
> > (!link) {
> >         dev_err(isi->dev,
> >                 "Failed to create device link to source %s\n", sd->name);
> >         return -EINVAL;
> > }
> 
> Ah yes indeed with the ISI it should already be handled.
> 
> I can't test this on hardware now as I'm travelling. Is the system hang happening
> at suspend or resume time ? What is the order of the suspend/resume handlers
> calls for the imx8-isi driver and the
> imx8mq-mipi-csi2 driver ?

#1) Is the system hang happening at suspend or resume time ?
       After applying your patches, system hang will happened at resume time. Adding
       log and enable no_console_suspend, I can know the the point of causing issue is
       accessing CSI registers when top-level(ISI) device try to enable stream from CSI in
       ISI resume callback like bellow:
       mxc_isi_pm_resume(dev)
           mxc_isi_video_resume(pipe)
               mxc_isi_pipe_enable(pipe)
                   v4l2_subdev_enable_streams(...)       
                        mx8mq_mipi_csi_s_stream()
                            imx8mq_mipi_csi_start_stream()
                                imx8mq_mipi_csi_set_params(state)
                                    imx8mq_mipi_csi_write(state, CSI2RX_CFG_NUM_LANES, lanes - 1);      <---   causing kernel panic and system don't have any response

#2) What is the order of the suspend/resume handlers calls for the imx8-isi driver and the
       imx8mq-mipi-csi2 driver ?
       Suspend: ISI -> CSI
       Resume: CSI -> ISI

One more thing when I debugging this issue that the value of CSI device "power.usage_count" in two cases

Case 1: Don't do system suspend/resume and only run camera test.
              Top-level device(ISI) can call CSI s_stream when start/stop capture and CSI runtime_suspend/resume will
              be called in this case since the value of CSI device power.usage_count is 1

Case 2: Run camera test first and keep it run in backend, then run system suspend/resume.
              Top-level device(ISI) will CSI s_stream() to start capture when run camera test and then, ISI system suspend
              callback will disable stream from CSI by calling s_stream(), the pm_runtime_put(dev) doesn't call CSI runtime
              suspend callback since the value of CSI device power.usage_count is 2.

I'm not sure if it's helpfull, just for your reference.       

> 
> > For iMX8MQ, I'm trying to enable it, but meet some problems, so can't
> > give you the results in short time.
> >
> > > diff --git a/drivers/media/platform/nxp/imx7-media-csi.c
> > > b/drivers/media/platform/nxp/imx7-media-csi.c
> > > index 9566ff738818..c66b0621e395 100644
> > > --- a/drivers/media/platform/nxp/imx7-media-csi.c
> > > +++ b/drivers/media/platform/nxp/imx7-media-csi.c
> > > @@ -2057,9 +2057,22 @@ static int imx7_csi_notify_bound(struct
> > > v4l2_async_notifier *notifier,  {
> > >  	struct imx7_csi *csi = imx7_csi_notifier_to_dev(notifier);
> > >  	struct media_pad *sink = &csi->sd.entity.pads[IMX7_CSI_PAD_SINK];
> > > +	struct device_link *link;
> > >
> > >  	csi->src_sd = sd;
> > >
> > > +	/*
> > > +	 * Enforce suspend/resume ordering between the source (supplier) and
> > > +	 * the CSI (consumer). The source will be suspended before and resume
> > > +	 * after the CSI.
> > > +	 */
> > > +	link = device_link_add(csi->dev, sd->dev, DL_FLAG_STATELESS);
> > > +	if (!link) {
> > > +		dev_err(csi->dev,
> > > +			"Failed to create device link to source %s\n", sd-
> >name);
> > > +		return -EINVAL;
> > > +	}
> > > +
> > >  	return v4l2_create_fwnode_links_to_pad(sd, sink,
> MEDIA_LNK_FL_ENABLED |
> > >  					       MEDIA_LNK_FL_IMMUTABLE);  }
> > >
> > > > > [1]
> > > > > https://lore.kernel.org/r/20240929101635.1648234-1-guoniu.zhou@o
> > > > > ss.nxp.com
> > > > >
> > > > > Laurent Pinchart (3):
> > > > >   media: imx8mq-mipi-csi2: Drop stream stop/restart at suspend/resume
> time
> > > > >   media: imx8mq-mipi-csi2: Drop ST_SUSPENDED guard
> > > > >   media: imx8mq-mipi-csi2: Drop system suspend/resume handlers
> > > > >
> > > > >  drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 113
> > > > > ++----------------
> > > > >  1 file changed, 10 insertions(+), 103 deletions(-)
> > > > >
> > > > >
> > > > > base-commit: 81ee62e8d09ee3c7107d11c8bbfd64073ab601ad
> 
> --
> Regards,
> 
> Laurent Pinchart