tpm: cr50: i2c: use jiffies to wait for tpm ready irq

Message ID 20230314135400.1.I5561dfbc4438418281626e43e345e8acc879cd7c@changeid
State New
Headers
Series tpm: cr50: i2c: use jiffies to wait for tpm ready irq |

Commit Message

Mark Hasemeyer March 14, 2023, 7:54 p.m. UTC
  When waiting for a tpm ready completion, the cr50 i2c driver incorrectly
assumes that the value of timeout_a is represented in milliseconds
instead of jiffies.

Remove the msecs_to_jiffies conversion.

Signed-off-by: Mark Hasemeyer <markhas@chromium.org>
---

 drivers/char/tpm/tpm_tis_i2c_cr50.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
  

Comments

Jarkko Sakkinen March 19, 2023, 1:36 p.m. UTC | #1
On Tue, Mar 14, 2023 at 01:54:04PM -0600, Mark Hasemeyer wrote:
> When waiting for a tpm ready completion, the cr50 i2c driver incorrectly
> assumes that the value of timeout_a is represented in milliseconds
> instead of jiffies.
> 
> Remove the msecs_to_jiffies conversion.
> 
> Signed-off-by: Mark Hasemeyer <markhas@chromium.org>
> ---
> 
>  drivers/char/tpm/tpm_tis_i2c_cr50.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> index 77cea5b31c6e4..376ae18a04ebb 100644
> --- a/drivers/char/tpm/tpm_tis_i2c_cr50.c
> +++ b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> @@ -100,8 +100,7 @@ static int tpm_cr50_i2c_wait_tpm_ready(struct tpm_chip *chip)
>  	}
>  
>  	/* Wait for interrupt to indicate TPM is ready to respond */
> -	if (!wait_for_completion_timeout(&priv->tpm_ready,
> -					 msecs_to_jiffies(chip->timeout_a))) {
> +	if (!wait_for_completion_timeout(&priv->tpm_ready, chip->timeout_a)) {
>  		dev_warn(&chip->dev, "Timeout waiting for TPM ready\n");
>  		return -ETIMEDOUT;
>  	}
> -- 
> 2.40.0.rc2.332.ga46443480c-goog
> 

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

BR, Jarkko
  

Patch

diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c b/drivers/char/tpm/tpm_tis_i2c_cr50.c
index 77cea5b31c6e4..376ae18a04ebb 100644
--- a/drivers/char/tpm/tpm_tis_i2c_cr50.c
+++ b/drivers/char/tpm/tpm_tis_i2c_cr50.c
@@ -100,8 +100,7 @@  static int tpm_cr50_i2c_wait_tpm_ready(struct tpm_chip *chip)
 	}
 
 	/* Wait for interrupt to indicate TPM is ready to respond */
-	if (!wait_for_completion_timeout(&priv->tpm_ready,
-					 msecs_to_jiffies(chip->timeout_a))) {
+	if (!wait_for_completion_timeout(&priv->tpm_ready, chip->timeout_a)) {
 		dev_warn(&chip->dev, "Timeout waiting for TPM ready\n");
 		return -ETIMEDOUT;
 	}