[PATCH] Input: stmfts - retry commands after timeout

[Mattijs Korpershoek]

On Thu, Nov 17, 2022 at 14:28, "Lin, Meng-Bo" <linmengbo0689 at protonmail.com> wrote:

> Add #define STMFTS_RETRY_COUNT 3 to retry stmfts_command() 3 times.
> Without it, STMFTS_SYSTEM_RESET or STMFTS_SLEEP_OUT may return -110 to
> failed attempt due to no event received for completion.
>
> Signed-off-by: Lin, Meng-Bo <linmengbo0689 at protonmail.com>

Reviewed-by: Mattijs Korpershoek <mkorpershoek at baylibre.com>

> ---
>  drivers/input/touchscreen/stmfts.c | 20 +++++++++++---------
>  1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c
> index d5bd170808fb..22de34966373 100644
> --- a/drivers/input/touchscreen/stmfts.c
> +++ b/drivers/input/touchscreen/stmfts.c
> @@ -68,6 +68,7 @@
>  #define STMFTS_DATA_MAX_SIZE	(STMFTS_EVENT_SIZE * STMFTS_STACK_DEPTH)
>  #define STMFTS_MAX_FINGERS	10
>  #define STMFTS_DEV_NAME		"stmfts"
> +#define STMFTS_RETRY_COUNT	3
>  
>  enum stmfts_regulators {
>  	STMFTS_REGULATOR_VDD,
> @@ -317,19 +318,20 @@ static irqreturn_t stmfts_irq_handler(int irq, void *dev)
>  
>  static int stmfts_command(struct stmfts_data *sdata, const u8 cmd)
>  {
> -	int err;
> +	int err, retry;
>  
>  	reinit_completion(&sdata->cmd_done);
>  
> -	err = i2c_smbus_write_byte(sdata->client, cmd);
> -	if (err)
> -		return err;
> -
> -	if (!wait_for_completion_timeout(&sdata->cmd_done,
> -					 msecs_to_jiffies(1000)))
> -		return -ETIMEDOUT;
> +	for (retry = 0; retry < STMFTS_RETRY_COUNT; retry++) {
> +		err = i2c_smbus_write_byte(sdata->client, cmd);
> +		if (err)
> +			return err;
>  
> -	return 0;
> +		if (wait_for_completion_timeout(&sdata->cmd_done,
> +						msecs_to_jiffies(1000)))
> +			return 0;
> +	}
> +	return -ETIMEDOUT;
>  }
>  
>  static int stmfts_input_open(struct input_dev *dev)
> -- 
> 2.30.2