Since tpm1_get_timeouts and tpm2_get_timeouts are now called directly by the auto startup code in addition to being called by tpm_get_timeouts, push the flag check down into the individual functions to avoid going through them again if they've already set the TPM_CHIP_FLAG_HAVE_TIMEOUTS flag.
Cc: Peter Huewe peterhuewe@gmx.de Cc: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Cc: Jason Gunthorpe jgg@ziepe.ca Cc: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org Fixes: d4a317563207 ("tpm: move tpm 1.x selftest code from tpm-interface.c tpm1-cmd.c") Fixes: 9db7fe187c54 ("tpm: factor out tpm_startup function") Signed-off-by: Jerry Snitselaar jsnitsel@redhat.com --- drivers/char/tpm/tpm-interface.c | 3 --- drivers/char/tpm/tpm1-cmd.c | 3 +++ drivers/char/tpm/tpm2-cmd.c | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index d7a3888ad80f..3c9e14981ce6 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -237,9 +237,6 @@ EXPORT_SYMBOL_GPL(tpm_transmit_cmd);
int tpm_get_timeouts(struct tpm_chip *chip) { - if (chip->flags & TPM_CHIP_FLAG_HAVE_TIMEOUTS) - return 0; - if (chip->flags & TPM_CHIP_FLAG_TPM2) return tpm2_get_timeouts(chip); else diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c index 149e953ca369..5330b32d1469 100644 --- a/drivers/char/tpm/tpm1-cmd.c +++ b/drivers/char/tpm/tpm1-cmd.c @@ -345,6 +345,9 @@ int tpm1_get_timeouts(struct tpm_chip *chip) unsigned long timeout_old[4], timeout_chip[4], timeout_eff[4]; ssize_t rc;
+ if (chip->flags & TPM_CHIP_FLAG_HAVE_TIMEOUTS) + return 0; + rc = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, NULL, sizeof(cap.timeout)); if (rc == TPM_ERR_INVALID_POSTINIT) { diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index ba9acae83bff..55d96be86ed8 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -38,6 +38,9 @@ static struct tpm2_hash tpm2_hash_map[] = {
int tpm2_get_timeouts(struct tpm_chip *chip) { + if (chip->flags & TPM_CHIP_FLAG_HAVE_TIMEOUTS) + return 0; + /* Fixed timeouts for TPM2 */ chip->timeout_a = msecs_to_jiffies(TPM2_TIMEOUT_A); chip->timeout_b = msecs_to_jiffies(TPM2_TIMEOUT_B);