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

Message ID 20200325121510.25923-19-tomi.valkeinen@ti.com
State New
Headers show
  • CAL fixes and improvements
Related show

Commit Message

Tomi Valkeinen March 25, 2020, 12:15 p.m.
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

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 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index eb8eeb75879d..0f90078ee8c2 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -846,14 +846,15 @@  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,
-		usleep_range(1000, 1100);
+		usleep_range(500, 5000);
 	if (reg_read_field(ctx->dev, CAL_CSI2_TIMING(ctx->csi2_port),