提交 87434f58 编写于 作者: A Alexander Steffen 提交者: Jarkko Sakkinen

tpm: Use dynamic delay to wait for TPM 2.0 self test result

In order to avoid delaying the code longer than necessary while still
giving the TPM enough time to execute the self tests asynchronously, start
with a small delay between two polls and increase it each round.
Signed-off-by: NAlexander Steffen <Alexander.Steffen@infineon.com>
Reviewed-by: NJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: NJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: NJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
上级 2482b1bb
...@@ -877,20 +877,17 @@ static int tpm2_start_selftest(struct tpm_chip *chip, bool full) ...@@ -877,20 +877,17 @@ static int tpm2_start_selftest(struct tpm_chip *chip, bool full)
static int tpm2_do_selftest(struct tpm_chip *chip) static int tpm2_do_selftest(struct tpm_chip *chip)
{ {
int rc; int rc;
unsigned int loops; unsigned int delay_msec = 20;
unsigned int delay_msec = 100; long duration;
unsigned long duration;
int i;
duration = tpm2_calc_ordinal_duration(chip, TPM2_CC_SELF_TEST);
loops = jiffies_to_msecs(duration) / delay_msec; duration = jiffies_to_msecs(
tpm2_calc_ordinal_duration(chip, TPM2_CC_SELF_TEST));
rc = tpm2_start_selftest(chip, false); rc = tpm2_start_selftest(chip, false);
if (rc) if (rc)
return rc; return rc;
for (i = 0; i < loops; i++) { while (duration > 0) {
/* Attempt to read a PCR value */ /* Attempt to read a PCR value */
rc = tpm2_pcr_read(chip, 0, NULL); rc = tpm2_pcr_read(chip, 0, NULL);
if (rc < 0) if (rc < 0)
...@@ -900,6 +897,10 @@ static int tpm2_do_selftest(struct tpm_chip *chip) ...@@ -900,6 +897,10 @@ static int tpm2_do_selftest(struct tpm_chip *chip)
break; break;
tpm_msleep(delay_msec); tpm_msleep(delay_msec);
duration -= delay_msec;
/* wait longer the next round */
delay_msec *= 2;
} }
return rc; return rc;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册