Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dd6d0d4 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

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



commit 2ba5780ce30549cf57929b01d8cba6fe656e31c5 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: stable@vger.kernel.org
Cc: Nayna Jain <nayna@linux.vnet.ibm.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Reviewed-by: default avatarNayna Jain <nayna@linux.ibm.com>
Tested-by: Nayna Jain <nayna@linux.ibm.com> (For TPM 2.0)
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6e2ecb4f

drivers/char/tpm/tpm_i2c_nuvoton.c

+7 −4
Original line number Diff line number Diff line
@@ -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);