tpm: prepare support for TPMv2.x commands

Choice between v1 and v2 compliant functions is done with the
configuration.

Create the various files that will receive TPMv2-only code on the same
scheme as for the TPMv1 code.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/cmd/Makefile b/cmd/Makefile
index 6164f6e611f8dff6096c64736a86e7db24a698e8..e0088df33bd1be1763870102682d2fc920a0173c 100644 (file)
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -123,6 +123,7 @@ obj-$(CONFIG_HUSH_PARSER) += test.o
 obj-$(CONFIG_CMD_TPM) += tpm-common.o
 obj-$(CONFIG_CMD_TPM_V1) += tpm-v1.o
 obj-$(CONFIG_CMD_TPM_TEST) += tpm_test.o
+obj-$(CONFIG_CMD_TPM_V2) += tpm-v2.o
 obj-$(CONFIG_CMD_CROS_EC) += cros_ec.o
 obj-$(CONFIG_CMD_TSI148) += tsi148.o
 obj-$(CONFIG_CMD_UBI) += ubi.o

diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
new file mode 100644 (file)
index 0000000..8564aba
--- /dev/null
+++ b/cmd/tpm-v2.c
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2018 Bootlin
+ * Author: Miquel Raynal <miquel.raynal@bootlin.com>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <log.h>
+#include <tpm-common.h>
+#include <tpm-v2.h>
+#include "tpm-user-utils.h"
+
+static cmd_tbl_t tpm2_commands[] = {
+       U_BOOT_CMD_MKENT(info, 0, 1, do_tpm_info, "", ""),
+       U_BOOT_CMD_MKENT(init, 0, 1, do_tpm_init, "", ""),
+};
+
+cmd_tbl_t *get_tpm_commands(unsigned int *size)
+{
+       *size = ARRAY_SIZE(tpm2_commands);
+
+       return tpm2_commands;
+}
+
+U_BOOT_CMD(tpm, CONFIG_SYS_MAXARGS, 1, do_tpm, "Issue a TPMv2.x command",
+"<command> [<arguments>]\n"
+"\n"
+"info\n"
+"    Show information about the TPM.\n"
+"init\n"
+"    Initialize the software stack. Always the first command to issue.\n"
+);

diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c
index 9488b091a2e823cd53680dbd1573c9859b3dc072..412697eedc4d49eeddd1ae35c3fe9973c979c9d9 100644 (file)
--- a/drivers/tpm/tpm-uclass.c
+++ b/drivers/tpm/tpm-uclass.c
@@ -9,6 +9,8 @@
 #include <linux/unaligned/be_byteshift.h>
 #if defined(CONFIG_TPM_V1)
 #include <tpm-v1.h>
+#elif defined(CONFIG_TPM_V2)
+#include <tpm-v2.h>
 #endif
 #include "tpm_internal.h"
 

diff --git a/include/tpm-common.h b/include/tpm-common.h
index e0ba696f1c9505fdff47e87dee5ffd75e492ea5b..734c2c9d5398acf75939dfefc5f9ec5e7c42b87d 100644 (file)
--- a/include/tpm-common.h
+++ b/include/tpm-common.h
@@ -35,11 +35,17 @@ enum tpm_duration {
  *
  * @duration_ms:       Length of each duration type in milliseconds
  * @retry_time_ms:     Time to wait before retrying receive
+ * @pcr_count:         Number of PCR per bank
+ * @pcr_select_min:    Minimum size in bytes of the pcrSelect array
  * @buf:               Buffer used during the exchanges with the chip
  */
 struct tpm_chip_priv {
        uint duration_ms[TPM_DURATION_COUNT];
        uint retry_time_ms;
+#if defined(CONFIG_TPM_V2)
+       uint pcr_count;
+       uint pcr_select_min;
+#endif
        u8 buf[TPM_DEV_BUFSIZE + sizeof(u8)];  /* Max buffer size + addr */
 };
 

diff --git a/include/tpm-v2.h b/include/tpm-v2.h
new file mode 100644 (file)
index 0000000..fac0808
--- /dev/null
+++ b/include/tpm-v2.h
@@ -0,0 +1,128 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (c) 2018 Bootlin
+ * Author: Miquel Raynal <miquel.raynal@bootlin.com>
+ */
+
+#ifndef __TPM_V2_H
+#define __TPM_V2_H
+
+#include <tpm-common.h>
+
+#define TPM2_DIGEST_LEN                32
+
+/**
+ * TPM2 Structure Tags for command/response buffers.
+ *
+ * @TPM2_ST_NO_SESSIONS: the command does not need an authentication.
+ * @TPM2_ST_SESSIONS: the command needs an authentication.
+ */
+enum tpm2_structures {
+       TPM2_ST_NO_SESSIONS     = 0x8001,
+       TPM2_ST_SESSIONS        = 0x8002,
+};
+
+/**
+ * TPM2 type of boolean.
+ */
+enum tpm2_yes_no {
+       TPMI_YES                = 1,
+       TPMI_NO                 = 0,
+};
+
+/**
+ * TPM2 startup values.
+ *
+ * @TPM2_SU_CLEAR: reset the internal state.
+ * @TPM2_SU_STATE: restore saved state (if any).
+ */
+enum tpm2_startup_types {
+       TPM2_SU_CLEAR           = 0x0000,
+       TPM2_SU_STATE           = 0x0001,
+};
+
+/**
+ * TPM2 permanent handles.
+ *
+ * @TPM2_RH_OWNER: refers to the 'owner' hierarchy.
+ * @TPM2_RS_PW: indicates a password.
+ * @TPM2_RH_LOCKOUT: refers to the 'lockout' hierarchy.
+ * @TPM2_RH_ENDORSEMENT: refers to the 'endorsement' hierarchy.
+ * @TPM2_RH_PLATFORM: refers to the 'platform' hierarchy.
+ */
+enum tpm2_handles {
+       TPM2_RH_OWNER           = 0x40000001,
+       TPM2_RS_PW              = 0x40000009,
+       TPM2_RH_LOCKOUT         = 0x4000000A,
+       TPM2_RH_ENDORSEMENT     = 0x4000000B,
+       TPM2_RH_PLATFORM        = 0x4000000C,
+};
+
+/**
+ * TPM2 command codes used at the beginning of a buffer, gives the command.
+ *
+ * @TPM2_CC_STARTUP: TPM2_Startup().
+ * @TPM2_CC_SELF_TEST: TPM2_SelfTest().
+ * @TPM2_CC_CLEAR: TPM2_Clear().
+ * @TPM2_CC_CLEARCONTROL: TPM2_ClearControl().
+ * @TPM2_CC_HIERCHANGEAUTH: TPM2_HierarchyChangeAuth().
+ * @TPM2_CC_PCR_SETAUTHPOL: TPM2_PCR_SetAuthPolicy().
+ * @TPM2_CC_DAM_RESET: TPM2_DictionaryAttackLockReset().
+ * @TPM2_CC_DAM_PARAMETERS: TPM2_DictionaryAttackParameters().
+ * @TPM2_CC_GET_CAPABILITY: TPM2_GetCapibility().
+ * @TPM2_CC_PCR_READ: TPM2_PCR_Read().
+ * @TPM2_CC_PCR_EXTEND: TPM2_PCR_Extend().
+ * @TPM2_CC_PCR_SETAUTHVAL: TPM2_PCR_SetAuthValue().
+ */
+enum tpm2_command_codes {
+       TPM2_CC_STARTUP         = 0x0144,
+       TPM2_CC_SELF_TEST       = 0x0143,
+       TPM2_CC_CLEAR           = 0x0126,
+       TPM2_CC_CLEARCONTROL    = 0x0127,
+       TPM2_CC_HIERCHANGEAUTH  = 0x0129,
+       TPM2_CC_DAM_RESET       = 0x0139,
+       TPM2_CC_DAM_PARAMETERS  = 0x013A,
+       TPM2_CC_GET_CAPABILITY  = 0x017A,
+       TPM2_CC_PCR_READ        = 0x017E,
+       TPM2_CC_PCR_EXTEND      = 0x0182,
+};
+
+/**
+ * TPM2 return codes.
+ */
+enum tpm2_return_codes {
+       TPM2_RC_SUCCESS         = 0x0000,
+       TPM2_RC_BAD_TAG         = 0x001E,
+       TPM2_RC_FMT1            = 0x0080,
+       TPM2_RC_HASH            = TPM2_RC_FMT1 + 0x0003,
+       TPM2_RC_VALUE           = TPM2_RC_FMT1 + 0x0004,
+       TPM2_RC_SIZE            = TPM2_RC_FMT1 + 0x0015,
+       TPM2_RC_BAD_AUTH        = TPM2_RC_FMT1 + 0x0022,
+       TPM2_RC_HANDLE          = TPM2_RC_FMT1 + 0x000B,
+       TPM2_RC_VER1            = 0x0100,
+       TPM2_RC_INITIALIZE      = TPM2_RC_VER1 + 0x0000,
+       TPM2_RC_FAILURE         = TPM2_RC_VER1 + 0x0001,
+       TPM2_RC_DISABLED        = TPM2_RC_VER1 + 0x0020,
+       TPM2_RC_AUTH_MISSING    = TPM2_RC_VER1 + 0x0025,
+       TPM2_RC_COMMAND_CODE    = TPM2_RC_VER1 + 0x0043,
+       TPM2_RC_AUTHSIZE        = TPM2_RC_VER1 + 0x0044,
+       TPM2_RC_AUTH_CONTEXT    = TPM2_RC_VER1 + 0x0045,
+       TPM2_RC_NEEDS_TEST      = TPM2_RC_VER1 + 0x0053,
+       TPM2_RC_WARN            = 0x0900,
+       TPM2_RC_TESTING         = TPM2_RC_WARN + 0x000A,
+       TPM2_RC_REFERENCE_H0    = TPM2_RC_WARN + 0x0010,
+       TPM2_RC_LOCKOUT         = TPM2_RC_WARN + 0x0021,
+};
+
+/**
+ * TPM2 algorithms.
+ */
+enum tpm2_algorithms {
+       TPM2_ALG_XOR            = 0x0A,
+       TPM2_ALG_SHA256         = 0x0B,
+       TPM2_ALG_SHA384         = 0x0C,
+       TPM2_ALG_SHA512         = 0x0D,
+       TPM2_ALG_NULL           = 0x10,
+};
+
+#endif /* __TPM_V2_H */

diff --git a/lib/Makefile b/lib/Makefile
index 72504e7654a89917fafbdd0e80e95f5541831924..e6cb4afc232650ac31072fcd553fb5be7c732cc6 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -41,6 +41,7 @@ obj-y += rc4.o
 obj-$(CONFIG_SUPPORT_EMMC_RPMB) += sha256.o
 obj-$(CONFIG_TPM) += tpm-common.o
 obj-$(CONFIG_TPM_V1) += tpm-v1.o
+obj-$(CONFIG_TPM_V2) += tpm-v2.o
 obj-$(CONFIG_RBTREE)   += rbtree.o
 obj-$(CONFIG_BITREVERSE) += bitrev.o
 obj-y += list_sort.o

diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c
new file mode 100644 (file)
index 0000000..35dee03
--- /dev/null
+++ b/lib/tpm-v2.c
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2018 Bootlin
+ * Author: Miquel Raynal <miquel.raynal@bootlin.com>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <tpm-common.h>
+#include <tpm-v2.h>
+#include "tpm-utils.h"