tpm_tis: fix iTPM probe via probe_itpm() function

probe_itpm() function is supposed to send command without an itpm flag set
and if this fails to repeat it, this time with the itpm flag set.

However, commit 41a5e1cf1fe15 ("tpm/tpm_tis: Split tpm_tis driver into a
core and TCG TIS compliant phy") moved the itpm flag from an "itpm"
variable to a TPM_TIS_ITPM_POSSIBLE chip flag, so setting the
(now function-local) itpm variable no longer had any effect.

Finally, this function-local itpm variable was removed by
commit 56af322156dbe9 ("tpm/tpm_tis: remove unused itpm variable")

Tested only on non-iTPM TIS TPM.

Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 45f8840ee67868fb1a803c2d36b7e76512512dc8..c0f296b5d41344c84f85a6a6a4c7040d91cb819c 100644 (file)
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -464,6 +464,9 @@ static int probe_itpm(struct tpm_chip *chip)
        size_t len = sizeof(cmd_getticks);
        u16 vendor;
 
+       if (priv->flags & TPM_TIS_ITPM_WORKAROUND)
+               return 0;
+
        rc = tpm_tis_read16(priv, TPM_DID_VID(0), &vendor);
        if (rc < 0)
                return rc;
@@ -479,12 +482,15 @@ static int probe_itpm(struct tpm_chip *chip)
        tpm_tis_ready(chip);
        release_locality(chip, priv->locality, 0);
 
+       priv->flags |= TPM_TIS_ITPM_WORKAROUND;
+
        rc = tpm_tis_send_data(chip, cmd_getticks, len);
-       if (rc == 0) {
+       if (rc == 0)
                dev_info(&chip->dev, "Detected an iTPM.\n");
-               rc = 1;
-       } else
+       else {
+               priv->flags &= ~TPM_TIS_ITPM_WORKAROUND;
                rc = -EFAULT;
+       }
 
 out:
        tpm_tis_ready(chip);
@@ -741,15 +747,10 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
                 (chip->flags & TPM_CHIP_FLAG_TPM2) ? "2.0" : "1.2",
                 vendor >> 16, rid);
 
-       if (!(priv->flags & TPM_TIS_ITPM_WORKAROUND)) {
-               probe = probe_itpm(chip);
-               if (probe < 0) {
-                       rc = -ENODEV;
-                       goto out_err;
-               }
-
-               if (!!probe)
-                       priv->flags |= TPM_TIS_ITPM_WORKAROUND;
+       probe = probe_itpm(chip);
+       if (probe < 0) {
+               rc = -ENODEV;
+               goto out_err;
        }
 
        /* Figure out the capabilities */