tpm: Export the open/close functions

At present these functions are not accessible outside the TPM library, but
in some cases we need to call them. Export them in the header file and add
a define for the SHA1 digest size.

Also adjust tpm_open() to call tpm_close() first so that the TPM is in a
known state before opening (e.g. by a previous phase of U-Boot).

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index e993fd9..30194bc 100644 (file)
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -388,6 +388,27 @@ static int tis_readresponse(struct udevice *dev, u8 *buffer, size_t len)
        return offset;
 }
 
+static int tpm_tis_lpc_close(struct udevice *dev)
+{
+       struct tpm_tis_lpc_priv *priv = dev_get_priv(dev);
+       struct tpm_locality *regs = priv->regs;
+       u8 locality = 0;
+
+       if (tpm_read_word(priv, &regs[locality].access) &
+           TIS_ACCESS_ACTIVE_LOCALITY) {
+               tpm_write_word(priv, TIS_ACCESS_ACTIVE_LOCALITY,
+                              &regs[locality].access);
+
+               if (tis_wait_reg(priv, &regs[locality].access,
+                                TIS_ACCESS_ACTIVE_LOCALITY, 0) == -ETIMEDOUT) {
+                       printf("%s:%d - failed to release locality %d\n",
+                              __FILE__, __LINE__, locality);
+                       return -ETIMEDOUT;
+               }
+       }
+       return 0;
+}
+
 static int tpm_tis_lpc_open(struct udevice *dev)
 {
        struct tpm_tis_lpc_priv *priv = dev_get_priv(dev);
@@ -395,6 +416,12 @@ static int tpm_tis_lpc_open(struct udevice *dev)
        u8 locality = 0; /* we use locality zero for everything. */
        int ret;
 
+       ret = tpm_tis_lpc_close(dev);
+       if (ret) {
+               printf("%s: Failed to close TPM\n", __func__);
+               return ret;
+       }
+
        /* now request access to locality. */
        tpm_write_word(priv, TIS_ACCESS_REQUEST_USE, &regs[locality].access);
 
@@ -410,27 +437,7 @@ static int tpm_tis_lpc_open(struct udevice *dev)
 
        tpm_write_word(priv, TIS_STS_COMMAND_READY,
                       &regs[locality].tpm_status);
-       return 0;
-}
-
-static int tpm_tis_lpc_close(struct udevice *dev)
-{
-       struct tpm_tis_lpc_priv *priv = dev_get_priv(dev);
-       struct tpm_locality *regs = priv->regs;
-       u8 locality = 0;
-
-       if (tpm_read_word(priv, &regs[locality].access) &
-           TIS_ACCESS_ACTIVE_LOCALITY) {
-               tpm_write_word(priv, TIS_ACCESS_ACTIVE_LOCALITY,
-                              &regs[locality].access);
 
-               if (tis_wait_reg(priv, &regs[locality].access,
-                                TIS_ACCESS_ACTIVE_LOCALITY, 0) == -ETIMEDOUT) {
-                       printf("%s:%d - failed to release locality %d\n",
-                              __FILE__, __LINE__, locality);
-                       return -ETIMEDOUT;
-               }
-       }
        return 0;
 }
 

diff --git a/include/tpm-common.h b/include/tpm-common.h
index 449ad4c..f8c5569 100644 (file)
--- a/include/tpm-common.h
+++ b/include/tpm-common.h
@@ -182,6 +182,24 @@ int do_##cmd(cmd_tbl_t *cmdtp, int flag,           \
 }
 
 /**
+ * tpm_open() - Request access to locality 0 for the caller
+ *
+ * After all commands have been completed the caller is supposed to
+ * call tpm_close().
+ *
+ * Returns 0 on success, -ve on failure.
+ */
+int tpm_open(struct udevice *dev);
+
+/**
+ * tpm_close() - Close the current session
+ *
+ * Releasing the locked locality. Returns 0 on success, -ve 1 on
+ * failure (in case lock removal did not succeed).
+ */
+int tpm_close(struct udevice *dev);
+
+/**
  * tpm_get_desc() - Get a text description of the TPM
  *
  * @dev:       Device to check

diff --git a/lib/tpm-utils.h b/lib/tpm-utils.h
index a9cb7dc..ac95f26 100644 (file)
--- a/lib/tpm-utils.h
+++ b/lib/tpm-utils.h
@@ -19,24 +19,6 @@
 #define tpm_u32(x) tpm_u16((x) >> 16), tpm_u16((x) & 0xFFFF)
 
 /**
- * tpm_open() - Request access to locality 0 for the caller
- *
- * After all commands have been completed the caller is supposed to
- * call tpm_close().
- *
- * Returns 0 on success, -ve on failure.
- */
-int tpm_open(struct udevice *dev);
-
-/**
- * tpm_close() - Close the current session
- *
- * Releasing the locked locality. Returns 0 on success, -ve 1 on
- * failure (in case lock removal did not succeed).
- */
-int tpm_close(struct udevice *dev);
-
-/**
  * Pack data into a byte string.  The data types are specified in
  * the format string: 'b' means unsigned byte, 'w' unsigned word,
  * 'd' unsigned double word, and 's' byte string.  The data are a