Re: [PATCH] tpm: tpm_i2c_nuvoton: use correct command duration for TPM 2.x

[Nayna Jain]

On 10/17/2018 10:02 PM, Tomas Winkler wrote:

diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c 
b/drivers/char/tpm/tpm_i2c_nuvoton.c
index caa86b19c76d..f74f451baf6a 100644
--- a/drivers/char/tpm/tpm_i2c_nuvoton.c
+++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
@@ -369,6 +369,7 @@ static int i2c_nuvoton_send(struct tpm_chip *chip, u8 *buf, 
size_t len)
        struct device *dev = chip->dev.parent;
        struct i2c_client *client = to_i2c_client(dev);
        u32 ordinal;
+       unsigned long duration;
        size_t count = 0;
        int burst_count, bytes2write, retries, rc = -EIO;

@@ -455,10 +456,12 @@ static int i2c_nuvoton_send(struct tpm_chip *chip, u8 
*buf, size_t len)
                return rc;
        }
        ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));
-       rc = i2c_nuvoton_wait_for_data_avail(chip,
-                                            tpm_calc_ordinal_duration(chip,
-                                                                      ordinal),
-                                            &priv->read_queue);
+       if (chip->flags & TPM_CHIP_FLAG_TPM2)
+               duration = tpm2_calc_ordinal_duration(chip, ordinal);
+       else
+               duration = tpm_calc_ordinal_duration(chip, ordinal);
+
+       rc = i2c_nuvoton_wait_for_data_avail(chip, duration, &priv->read_queue);
        if (rc) {
                dev_err(dev, "%s() timeout command duration\n", __func__);
                i2c_nuvoton_ready(chip);

I only have Nuvoton TPM 2.0, tested for that.

Reviewed-by: Nayna Jain <na...@linux.ibm.com>
Tested-by: Nayna Jain <na...@linux.ibm.com> (For TPM 2.0)


Thanks & Regards,
    - Nayna