diff mbox series

[v2,18/19] media: ti-vpe: cal: improve wait for stop-state

Message ID	20200319075023.22151-19-tomi.valkeinen@ti.com (mailing list archive)
State	Superseded, archived
Delegated to:	Hans Verkuil
Headers	From: Tomi Valkeinen <tomi.valkeinen@ti.com> To: <linux-media@vger.kernel.org>, Benoit Parrot <bparrot@ti.com> CC: Mauro Carvalho Chehab <mchehab@kernel.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Hans Verkuil <hverkuil@xs4all.nl>, Tomi Valkeinen <tomi.valkeinen@ti.com> Subject: [PATCH v2 18/19] media: ti-vpe: cal: improve wait for stop-state Date: Thu, 19 Mar 2020 09:50:22 +0200 Message-ID: <20200319075023.22151-19-tomi.valkeinen@ti.com> In-Reply-To: <20200319075023.22151-1-tomi.valkeinen@ti.com> References: <20200319075023.22151-1-tomi.valkeinen@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-media-owner@vger.kernel.org Precedence: bulk
Series	CAL fixes and improvements \| [v2,00/19] CAL fixes and improvements [v2,01/19] media: ti-vpe: cal: fix DMA memory corruption [v2,02/19] media: ti-vpe: cal: improve enable_irqs [v2,03/19] media: ti-vpe: cal: fix use of wrong macro [v2,04/19] media: ti-vpe: cal: use runtime_resume for errata handling [v2,05/19] media: ti-vpe: cal: drop cal_runtime_get/put [v2,06/19] media: ti-vpe: cal: catch error irqs and print errors [v2,07/19] media: ti-vpe: cal: print errors on timeouts [v2,08/19] media: ti-vpe: cal: simplify irq handling [v2,09/19] media: ti-vpe: cal: remove useless CAL_GEN_* macros [v2,10/19] media: ti-vpe: cal: remove useless IRQ defines [v2,11/19] media: ti-vpe: cal: use reg_write_field [v2,12/19] media: ti-vpe: cal: cleanup CIO power enable/disable [v2,13/19] media: ti-vpe: cal: fix dummy read to phy [v2,14/19] media: ti-vpe: cal: program number of lines properly [v2,15/19] media: ti-vpe: cal: set DMA max seg size [v2,16/19] media: ti-vpe: cal: move code to separate functions [v2,17/19] media: ti-vpe: cal: improve wait for CIO resetdone [v2,18/19] media: ti-vpe: cal: improve wait for stop-state [v2,19/19] media: ti-vpe: cal: fix stop state timeout

Commit Message

Tomi Valkeinen March 19, 2020, 7:50 a.m. UTC

  Sometimes there is a timeout when waiting for the Stop-State.  Testing
shows that sometimes we need to wait more than what the current code
does. It is not clear how long this wait can be, but it is based on how
quickly the sensor provides a valid clock, and how quickly CAL syncs to
it.

Change the code to make it more obvious how long we'll wait, and set a
wider range for usleep_range. Increase the timeout to 750ms.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 drivers/media/platform/ti-vpe/cal.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

Comments

Benoit Parrot March 19, 2020, 10:46 p.m. UTC | #1

Tomi,

Thanks for the patch.

On 3/19/20 2:50 AM, Tomi Valkeinen wrote:
> Sometimes there is a timeout when waiting for the Stop-State.  Testing
> shows that sometimes we need to wait more than what the current code
> does. It is not clear how long this wait can be, but it is based on how
> quickly the sensor provides a valid clock, and how quickly CAL syncs to
> it.
> 
> Change the code to make it more obvious how long we'll wait, and set a
> wider range for usleep_range. Increase the timeout to 750ms.
> 
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

Reviewed-by: Benoit Parrot <bparrot@ti.com>

> ---
>  drivers/media/platform/ti-vpe/cal.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
> index 0dc7892881e7..0f90078ee8c2 100644
> --- a/drivers/media/platform/ti-vpe/cal.c
> +++ b/drivers/media/platform/ti-vpe/cal.c
> @@ -846,19 +846,16 @@ static void csi2_wait_complexio_reset(struct cal_ctx *ctx)
>  
>  static void csi2_wait_stop_state(struct cal_ctx *ctx)
>  {
> -	int i;
> +	unsigned long timeout;
>  
> -	for (i = 0; i < 10; i++) {
> +	timeout = jiffies + msecs_to_jiffies(750);
> +	while (time_before(jiffies, timeout)) {
>  		if (reg_read_field(ctx->dev,
>  				   CAL_CSI2_TIMING(ctx->csi2_port),
>  				   CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK) == 0)
>  			break;
> -		usleep_range(1000, 1100);
> +		usleep_range(500, 5000);
>  	}
> -	ctx_dbg(3, ctx, "CAL_CSI2_TIMING(%d) = 0x%08x Stop State Reached %s\n",
> -		ctx->csi2_port,
> -		reg_read(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port)),
> -		(i >= 10) ? "(timeout)" : "");
>  
>  	if (reg_read_field(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port),
>  			   CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK) != 0)
>

diff mbox series

Patch

diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 0dc7892881e7..0f90078ee8c2 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -846,19 +846,16 @@  static void csi2_wait_complexio_reset(struct cal_ctx *ctx)
 
 static void csi2_wait_stop_state(struct cal_ctx *ctx)
 {
-	int i;
+	unsigned long timeout;
 
-	for (i = 0; i < 10; i++) {
+	timeout = jiffies + msecs_to_jiffies(750);
+	while (time_before(jiffies, timeout)) {
 		if (reg_read_field(ctx->dev,
 				   CAL_CSI2_TIMING(ctx->csi2_port),
 				   CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK) == 0)
 			break;
-		usleep_range(1000, 1100);
+		usleep_range(500, 5000);
 	}
-	ctx_dbg(3, ctx, "CAL_CSI2_TIMING(%d) = 0x%08x Stop State Reached %s\n",
-		ctx->csi2_port,
-		reg_read(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port)),
-		(i >= 10) ? "(timeout)" : "");
 
 	if (reg_read_field(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port),
 			   CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK) != 0)