]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
tpm: wait for valid status
authorRoman Kapl <rka@sysgo.com>
Thu, 16 May 2019 16:32:48 +0000 (18:32 +0200)
committerTom Rini <trini@konsulko.com>
Thu, 11 Jul 2019 18:11:18 +0000 (14:11 -0400)
The TPM specification says that the EXPECT_DATA bit is not valid until
the VALID bit is set. Wait for that bit to be set. Fixes problems with
Ifineon SPI TPM.

Signed-off-by: Roman Kapl <rka@sysgo.com>
drivers/tpm/tpm2_tis_spi.c

index 8878130bd72e66344d9cc57079acc433fea10ab0..7186c179d1162f5bc797a8f6fbe4fe1b0e920dec 100644 (file)
@@ -295,6 +295,14 @@ static int tpm_tis_spi_wait_for_stat(struct udevice *dev, u8 mask,
        return -ETIMEDOUT;
 }
 
+static u8 tpm_tis_spi_valid_status(struct udevice *dev, u8 *status)
+{
+       struct tpm_chip *chip = dev_get_priv(dev);
+
+       return tpm_tis_spi_wait_for_stat(dev, TPM_STS_VALID,
+               chip->timeout_c, status);
+}
+
 static int tpm_tis_spi_get_burstcount(struct udevice *dev)
 {
        struct tpm_chip *chip = dev_get_priv(dev);
@@ -455,7 +463,7 @@ static int tpm_tis_spi_send(struct udevice *dev, const u8 *buf, size_t len)
                i += size;
        }
 
-       ret = tpm_tis_spi_status(dev, &status);
+       ret = tpm_tis_spi_valid_status(dev, &status);
        if (ret)
                goto out_err;
 
@@ -469,7 +477,7 @@ static int tpm_tis_spi_send(struct udevice *dev, const u8 *buf, size_t len)
        if (ret)
                goto out_err;
 
-       ret = tpm_tis_spi_status(dev, &status);
+       ret = tpm_tis_spi_valid_status(dev, &status);
        if (ret)
                goto out_err;