UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

tpm: move the delay_msec increment after sleep in tpm_transmit() 

Commit e2fb992d82 ("tpm: add retry logic") introduced a new loop to
handle the TPM2_RC_RETRY error. The loop retries the command after
sleeping for the specified time, which is incremented exponentially in
every iteration.

Unfortunately, the loop doubles the time before sleeping, causing the
initial sleep to be doubled. This patch fixes the initial sleep time.

Fixes: commit e2fb992d82 ("tpm: add retry logic")
Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com>
Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
This commit is contained in:
Nayna Jain 2018-04-02 21:50:06 +05:30 committed by Jarkko Sakkinen
parent 5859cdf550
commit 9298075697
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/char/tpm/tpm-interface.c
View File

@ -587,7 +587,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
*/ */
if (rc == TPM2_RC_TESTING && cc == TPM2_CC_SELF_TEST) if (rc == TPM2_RC_TESTING && cc == TPM2_CC_SELF_TEST)
break; break;
delay_msec *= 2;
if (delay_msec > TPM2_DURATION_LONG) { if (delay_msec > TPM2_DURATION_LONG) {
if (rc == TPM2_RC_RETRY) if (rc == TPM2_RC_RETRY)
dev_err(&chip->dev, "in retry loop\n"); dev_err(&chip->dev, "in retry loop\n");
@ -597,6 +597,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
break; break;
} }
tpm_msleep(delay_msec); tpm_msleep(delay_msec);
delay_msec *= 2;
memcpy(buf, save, save_size); memcpy(buf, save, save_size);
} }
return ret; return ret;