2023-03-14 19:54:35

by Mark Hasemeyer

Subject: [PATCH] tpm: cr50: i2c: use jiffies to wait for tpm ready irq

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 <[email protected]>
---

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

2023-03-19 13:36:55

by Jarkko Sakkinen

Subject: Re: [PATCH] tpm: cr50: i2c: use jiffies to wait for tpm ready irq

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 <[email protected]>
> ---
>
> 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 <[email protected]>

BR, Jarkko