tpm_tis: fix iTPM probe via probe_itpm() function

[mirror_ubuntu-artful-kernel.git] / drivers / char / tpm / tpm_tis_core.c

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 7993678954a2b7c2910233f77c6af1b5070af9cc..c0f296b5d41344c84f85a6a6a4c7040d91cb819c 100644 (file)
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -264,7 +264,7 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len)
        struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
        int rc, status, burstcnt;
        size_t count = 0;
-       bool itpm = priv->flags & TPM_TIS_ITPM_POSSIBLE;
+       bool itpm = priv->flags & TPM_TIS_ITPM_WORKAROUND;
 
        if (request_locality(chip, 0) < 0)
                return -EBUSY;
@@ -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);
@@ -552,7 +558,8 @@ static int tpm_tis_gen_interrupt(struct tpm_chip *chip)
        if (chip->flags & TPM_CHIP_FLAG_TPM2)
                return tpm2_get_tpm_pt(chip, 0x100, &cap2, desc);
        else
-               return tpm_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc);
+               return tpm_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc,
+                                 0);
 }
 
 /* Register the IRQ and issue a command that will cause an interrupt. If an
@@ -740,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_POSSIBLE)) {
-               probe = probe_itpm(chip);
-               if (probe < 0) {
-                       rc = -ENODEV;
-                       goto out_err;
-               }
-
-               if (!!probe)
-                       priv->flags |= TPM_TIS_ITPM_POSSIBLE;
+       probe = probe_itpm(chip);
+       if (probe < 0) {
+               rc = -ENODEV;
+               goto out_err;
        }
 
        /* Figure out the capabilities */