Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Jerry Snitselaar <jsnitsel@redhat.com>
To:     linux-integrity@vger.kernel.org
Cc:     Peter Huewe <peterhuewe@gmx.de>,
        Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
        Jason Gunthorpe <jgg@ziepe.ca>, linux-kernel@vger.kernel.org,
        stable@vger.kernel.org
Subject: [PATCH] tpm: move TPM_CHIP_FLAG_HAVE_TIMEOUTS check
Date:   Wed, 13 Nov 2019 01:00:02 -0700
Message-Id: <20191113080002.14932-1-jsnitsel@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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-interf=
ace.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);
=20
 int tpm_get_timeouts(struct tpm_chip *chip)
 {
-=09if (chip->flags & TPM_CHIP_FLAG_HAVE_TIMEOUTS)
-=09=09return 0;
-
 =09if (chip->flags & TPM_CHIP_FLAG_TPM2)
 =09=09return tpm2_get_timeouts(chip);
 =09else
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)
 =09unsigned long timeout_old[4], timeout_chip[4], timeout_eff[4];
 =09ssize_t rc;
=20
+=09if (chip->flags & TPM_CHIP_FLAG_HAVE_TIMEOUTS)
+=09=09return 0;
+
 =09rc =3D tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, NULL,
 =09=09=09 sizeof(cap.timeout));
 =09if (rc =3D=3D 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[] =3D {
=20
 int tpm2_get_timeouts(struct tpm_chip *chip)
 {
+=09if (chip->flags & TPM_CHIP_FLAG_HAVE_TIMEOUTS)
+=09=09return 0;
+
 =09/* Fixed timeouts for TPM2 */
 =09chip->timeout_a =3D msecs_to_jiffies(TPM2_TIMEOUT_A);
 =09chip->timeout_b =3D msecs_to_jiffies(TPM2_TIMEOUT_B);
--=20
2.24.0