Commit 9754d45e authored by Andrey Pronin's avatar Andrey Pronin Committed by Jarkko Sakkinen

tpm: read burstcount from TPM_STS in one 32-bit transaction

Some chips incorrectly support partial reads from TPM_STS register
at non-zero offsets. Read the entire 32-bits register instead of
making two 8-bit reads to support such devices and reduce the number
of bus transactions when obtaining the burstcount from TPM_STS.

Fixes: 27084efe ("tpm: driver for next generation TPM chips")
Signed-off-by: default avatarAndrey Pronin <apronin@chromium.org>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 1b0612b0
...@@ -157,22 +157,17 @@ static int get_burstcount(struct tpm_chip *chip) ...@@ -157,22 +157,17 @@ static int get_burstcount(struct tpm_chip *chip)
struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
unsigned long stop; unsigned long stop;
int burstcnt, rc; int burstcnt, rc;
u8 value; u32 value;
/* wait for burstcount */ /* wait for burstcount */
/* which timeout value, spec has 2 answers (c & d) */ /* which timeout value, spec has 2 answers (c & d) */
stop = jiffies + chip->timeout_d; stop = jiffies + chip->timeout_d;
do { do {
rc = tpm_tis_read8(priv, TPM_STS(priv->locality) + 1, &value); rc = tpm_tis_read32(priv, TPM_STS(priv->locality), &value);
if (rc < 0) if (rc < 0)
return rc; return rc;
burstcnt = value; burstcnt = (value >> 8) & 0xFFFF;
rc = tpm_tis_read8(priv, TPM_STS(priv->locality) + 2, &value);
if (rc < 0)
return rc;
burstcnt += value << 8;
if (burstcnt) if (burstcnt)
return burstcnt; return burstcnt;
msleep(TPM_TIMEOUT); msleep(TPM_TIMEOUT);
......
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