Commit c85a71fe authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman

tpm: tpm_i2c_nuvoton: use correct command duration for TPM 2.x

commit 2ba5780c upstream.

tpm_i2c_nuvoton calculated commands duration using TPM 1.x
values via tpm_calc_ordinal_duration() also for TPM 2.x chips.
Call tpm2_calc_ordinal_duration() for retrieving ordinal
duration for TPM 2.X chips.

Cc: Nayna Jain <>
Signed-off-by: default avatarTomas Winkler <>
Reviewed-by: default avatarNayna Jain <>
Tested-by: Nayna Jain <> (For TPM 2.0)
Reviewed-by: default avatarJarkko Sakkinen <>
Signed-off-by: default avatarJarkko Sakkinen <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent cb252053
......@@ -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,
if (chip->flags & TPM_CHIP_FLAG_TPM2)
duration = tpm2_calc_ordinal_duration(chip, ordinal);
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__);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment