Before we can start measuring the TPM must be cleared. Do this in the
post_probe() method of the uclass.

Signed-off-by: Heinrich Schuchardt <heinrich.schucha...@canonical.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodi...@linaro.org>
---
v3:
        rename dm_tpm_post_probe() to tpm_post_probe()
v2:
        tpm_startup2() is not available on all boards.
        tpm_startup() takes care of translating the call.
---
 drivers/tpm/tpm-uclass.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index f67fe1019b..99549bad7a 100644
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <linux/delay.h>
 #include <linux/unaligned/be_byteshift.h>
+#include <tpm_api.h>
 #include <tpm-v1.h>
 #include <tpm-v2.h>
 #include "tpm_internal.h"
@@ -136,6 +137,18 @@ int tpm_xfer(struct udevice *dev, const uint8_t *sendbuf, 
size_t send_size,
        return 0;
 }
 
+static int tpm_post_probe(struct udevice *dev)
+{
+       /*
+        * Clearing the TPM state is only possible once after a hard reset.
+        * As we do not know if the TPM has been cleared by a prior boot stage
+        * ignore the return value here.
+        */
+       tpm_startup(dev, TPM_ST_CLEAR);
+
+       return 0;
+}
+
 UCLASS_DRIVER(tpm) = {
        .id             = UCLASS_TPM,
        .name           = "tpm",
@@ -143,5 +156,6 @@ UCLASS_DRIVER(tpm) = {
 #if CONFIG_IS_ENABLED(OF_REAL)
        .post_bind      = dm_scan_fdt_dev,
 #endif
+       .post_probe     = tpm_post_probe,
        .per_device_auto        = sizeof(struct tpm_chip_priv),
 };
-- 
2.32.0

Reply via email to