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@xxxxxx>
> Tested-by: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
Reviewed-by: Benoit Parrot <bparrot@xxxxxx>
> ---
> 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)
>
