Subtree merge tag 'v6.12-dts' of dts repo [1] into dts/upstream

[J-u-boot.git] / cmd / tpm-v1.c

diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c
index 2807331524aa811d10d17357406baae2f3f5d535..6e019d1c7291b8ef894f749df5937aab742e77ca 100644 (file)
--- a/cmd/tpm-v1.c
+++ b/cmd/tpm-v1.c
@@ -3,16 +3,18 @@
  * Copyright (c) 2013 The Chromium OS Authors.
  */
 
-#include <common.h>
+#include <command.h>
 #include <env.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/unaligned.h>
 #include <tpm-common.h>
 #include <tpm-v1.h>
 #include "tpm-user-utils.h"
+#include <tpm_api.h>
 
-static int do_tpm_startup(cmd_tbl_t *cmdtp, int flag, int argc,
-                         char * const argv[])
+static int do_tpm_startup(struct cmd_tbl *cmdtp, int flag, int argc,
+                         char *const argv[])
 {
        enum tpm_startup_type mode;
        struct udevice *dev;
@@ -37,8 +39,8 @@ static int do_tpm_startup(cmd_tbl_t *cmdtp, int flag, int argc,
        return report_return_code(tpm_startup(dev, mode));
 }
 
-static int do_tpm_nv_define_space(cmd_tbl_t *cmdtp, int flag, int argc,
-                                 char * const argv[])
+static int do_tpm_nv_define_space(struct cmd_tbl *cmdtp, int flag, int argc,
+                                 char *const argv[])
 {
        u32 index, perm, size;
        struct udevice *dev;
@@ -54,11 +56,11 @@ static int do_tpm_nv_define_space(cmd_tbl_t *cmdtp, int flag, int argc,
        perm = simple_strtoul(argv[2], NULL, 0);
        size = simple_strtoul(argv[3], NULL, 0);
 
-       return report_return_code(tpm_nv_define_space(dev, index, perm, size));
+       return report_return_code(tpm1_nv_define_space(dev, index, perm, size));
 }
 
-static int do_tpm_nv_read_value(cmd_tbl_t *cmdtp, int flag, int argc,
-                               char * const argv[])
+static int do_tpm_nv_read_value(struct cmd_tbl *cmdtp, int flag, int argc,
+                               char *const argv[])
 {
        u32 index, count, rc;
        struct udevice *dev;
@@ -83,8 +85,8 @@ static int do_tpm_nv_read_value(cmd_tbl_t *cmdtp, int flag, int argc,
        return report_return_code(rc);
 }
 
-static int do_tpm_nv_write_value(cmd_tbl_t *cmdtp, int flag, int argc,
-                                char * const argv[])
+static int do_tpm_nv_write_value(struct cmd_tbl *cmdtp, int flag, int argc,
+                                char *const argv[])
 {
        struct udevice *dev;
        u32 index, rc;
@@ -110,8 +112,8 @@ static int do_tpm_nv_write_value(cmd_tbl_t *cmdtp, int flag, int argc,
        return report_return_code(rc);
 }
 
-static int do_tpm_extend(cmd_tbl_t *cmdtp, int flag, int argc,
-                        char * const argv[])
+static int do_tpm_extend(struct cmd_tbl *cmdtp, int flag, int argc,
+                        char *const argv[])
 {
        u8 in_digest[20], out_digest[20];
        struct udevice *dev;
@@ -129,7 +131,8 @@ static int do_tpm_extend(cmd_tbl_t *cmdtp, int flag, int argc,
                return CMD_RET_FAILURE;
        }
 
-       rc = tpm_extend(dev, index, in_digest, out_digest);
+       rc = tpm_pcr_extend(dev, index, in_digest, sizeof(in_digest),
+                           out_digest, "cmd");
        if (!rc) {
                puts("PCR value after execution of the command:\n");
                print_byte_string(out_digest, sizeof(out_digest));
@@ -138,8 +141,8 @@ static int do_tpm_extend(cmd_tbl_t *cmdtp, int flag, int argc,
        return report_return_code(rc);
 }
 
-static int do_tpm_pcr_read(cmd_tbl_t *cmdtp, int flag, int argc,
-                          char * const argv[])
+static int do_tpm_pcr_read(struct cmd_tbl *cmdtp, int flag, int argc,
+                          char *const argv[])
 {
        u32 index, count, rc;
        struct udevice *dev;
@@ -164,8 +167,8 @@ static int do_tpm_pcr_read(cmd_tbl_t *cmdtp, int flag, int argc,
        return report_return_code(rc);
 }
 
-static int do_tpm_tsc_physical_presence(cmd_tbl_t *cmdtp, int flag, int argc,
-                                       char * const argv[])
+static int do_tpm_tsc_physical_presence(struct cmd_tbl *cmdtp, int flag,
+                                       int argc, char *const argv[])
 {
        struct udevice *dev;
        u16 presence;
@@ -182,8 +185,8 @@ static int do_tpm_tsc_physical_presence(cmd_tbl_t *cmdtp, int flag, int argc,
        return report_return_code(tpm_tsc_physical_presence(dev, presence));
 }
 
-static int do_tpm_read_pubek(cmd_tbl_t *cmdtp, int flag, int argc,
-                            char * const argv[])
+static int do_tpm_read_pubek(struct cmd_tbl *cmdtp, int flag, int argc,
+                            char *const argv[])
 {
        struct udevice *dev;
        u32 count, rc;
@@ -207,8 +210,8 @@ static int do_tpm_read_pubek(cmd_tbl_t *cmdtp, int flag, int argc,
        return report_return_code(rc);
 }
 
-static int do_tpm_physical_set_deactivated(cmd_tbl_t *cmdtp, int flag, int argc,
-                                          char * const argv[])
+static int do_tpm_physical_set_deactivated(struct cmd_tbl *cmdtp, int flag,
+                                          int argc, char *const argv[])
 {
        struct udevice *dev;
        u8 state;
@@ -225,8 +228,8 @@ static int do_tpm_physical_set_deactivated(cmd_tbl_t *cmdtp, int flag, int argc,
        return report_return_code(tpm_physical_set_deactivated(dev, state));
 }
 
-static int do_tpm_get_capability(cmd_tbl_t *cmdtp, int flag, int argc,
-                                char * const argv[])
+static int do_tpm_get_capability(struct cmd_tbl *cmdtp, int flag, int argc,
+                                char *const argv[])
 {
        u32 cap_area, sub_cap, rc;
        void *cap;
@@ -253,8 +256,8 @@ static int do_tpm_get_capability(cmd_tbl_t *cmdtp, int flag, int argc,
        return report_return_code(rc);
 }
 
-static int do_tpm_raw_transfer(cmd_tbl_t *cmdtp, int flag, int argc,
-                              char * const argv[])
+static int do_tpm_raw_transfer(struct cmd_tbl *cmdtp, int flag, int argc,
+                              char *const argv[])
 {
        struct udevice *dev;
        void *command;
@@ -282,8 +285,8 @@ static int do_tpm_raw_transfer(cmd_tbl_t *cmdtp, int flag, int argc,
        return report_return_code(rc);
 }
 
-static int do_tpm_nv_define(cmd_tbl_t *cmdtp, int flag, int argc,
-                           char * const argv[])
+static int do_tpm_nv_define(struct cmd_tbl *cmdtp, int flag, int argc,
+                           char *const argv[])
 {
        u32 index, perm, size;
        struct udevice *dev;
@@ -303,11 +306,11 @@ static int do_tpm_nv_define(cmd_tbl_t *cmdtp, int flag, int argc,
        index = simple_strtoul(argv[2], NULL, 0);
        perm = simple_strtoul(argv[3], NULL, 0);
 
-       return report_return_code(tpm_nv_define_space(dev, index, perm, size));
+       return report_return_code(tpm1_nv_define_space(dev, index, perm, size));
 }
 
-static int do_tpm_nv_read(cmd_tbl_t *cmdtp, int flag, int argc,
-                         char * const argv[])
+static int do_tpm_nv_read(struct cmd_tbl *cmdtp, int flag, int argc,
+                         char *const argv[])
 {
        u32 index, count, err;
        struct udevice *dev;
@@ -341,8 +344,8 @@ static int do_tpm_nv_read(cmd_tbl_t *cmdtp, int flag, int argc,
        return report_return_code(err);
 }
 
-static int do_tpm_nv_write(cmd_tbl_t *cmdtp, int flag, int argc,
-                          char * const argv[])
+static int do_tpm_nv_write(struct cmd_tbl *cmdtp, int flag, int argc,
+                          char *const argv[])
 {
        u32 index, count, err;
        struct udevice *dev;
@@ -377,8 +380,8 @@ static int do_tpm_nv_write(cmd_tbl_t *cmdtp, int flag, int argc,
 
 #ifdef CONFIG_TPM_AUTH_SESSIONS
 
-static int do_tpm_oiap(cmd_tbl_t *cmdtp, int flag, int argc,
-                      char * const argv[])
+static int do_tpm_oiap(struct cmd_tbl *cmdtp, int flag, int argc,
+                      char *const argv[])
 {
        u32 auth_handle, err;
        struct udevice *dev;
@@ -388,14 +391,14 @@ static int do_tpm_oiap(cmd_tbl_t *cmdtp, int flag, int argc,
        if (rc)
                return rc;
 
-       err = tpm_oiap(dev, &auth_handle);
+       err = tpm1_oiap(dev, &auth_handle);
 
        return report_return_code(err);
 }
 
 #ifdef CONFIG_TPM_LOAD_KEY_BY_SHA1
-static int do_tpm_load_key_by_sha1(cmd_tbl_t *cmdtp, int flag, int argc, char *
-                                  const argv[])
+static int do_tpm_load_key_by_sha1(struct cmd_tbl *cmdtp, int flag, int argc,
+                                  char *const argv[])
 {
        u32 parent_handle = 0;
        u32 key_len, key_handle, err;
@@ -404,9 +407,9 @@ static int do_tpm_load_key_by_sha1(cmd_tbl_t *cmdtp, int flag, int argc, char *
        void *key;
        struct udevice *dev;
 
-       rc = get_tpm(&dev);
-       if (rc)
-               return rc;
+       err = get_tpm(&dev);
+       if (err)
+               return err;
 
        if (argc < 5)
                return CMD_RET_USAGE;
@@ -418,7 +421,7 @@ static int do_tpm_load_key_by_sha1(cmd_tbl_t *cmdtp, int flag, int argc, char *
                return CMD_RET_FAILURE;
        parse_byte_string(argv[4], usage_auth, NULL);
 
-       err = tpm_find_key_sha1(usage_auth, parent_hash, &parent_handle);
+       err = tpm1_find_key_sha1(dev, usage_auth, parent_hash, &parent_handle);
        if (err) {
                printf("Could not find matching parent key (err = %d)\n", err);
                return CMD_RET_FAILURE;
@@ -426,7 +429,7 @@ static int do_tpm_load_key_by_sha1(cmd_tbl_t *cmdtp, int flag, int argc, char *
 
        printf("Found parent key %08x\n", parent_handle);
 
-       err = tpm_load_key2_oiap(parent_handle, key, key_len, usage_auth,
+       err = tpm1_load_key2_oiap(dev, parent_handle, key, key_len, usage_auth,
                                 &key_handle);
        if (!err) {
                printf("Key handle is 0x%x\n", key_handle);
@@ -437,8 +440,8 @@ static int do_tpm_load_key_by_sha1(cmd_tbl_t *cmdtp, int flag, int argc, char *
 }
 #endif /* CONFIG_TPM_LOAD_KEY_BY_SHA1 */
 
-static int do_tpm_load_key2_oiap(cmd_tbl_t *cmdtp, int flag, int argc,
-                                char * const argv[])
+static int do_tpm_load_key2_oiap(struct cmd_tbl *cmdtp, int flag, int argc,
+                                char *const argv[])
 {
        u32 parent_handle, key_len, key_handle, err;
        u8 usage_auth[DIGEST_LENGTH];
@@ -460,16 +463,16 @@ static int do_tpm_load_key2_oiap(cmd_tbl_t *cmdtp, int flag, int argc,
                return CMD_RET_FAILURE;
        parse_byte_string(argv[4], usage_auth, NULL);
 
-       err = tpm_load_key2_oiap(dev, parent_handle, key, key_len, usage_auth,
-                                &key_handle);
+       err = tpm1_load_key2_oiap(dev, parent_handle, key, key_len, usage_auth,
+                                 &key_handle);
        if (!err)
                printf("Key handle is 0x%x\n", key_handle);
 
        return report_return_code(err);
 }
 
-static int do_tpm_get_pub_key_oiap(cmd_tbl_t *cmdtp, int flag, int argc,
-                                  char * const argv[])
+static int do_tpm_get_pub_key_oiap(struct cmd_tbl *cmdtp, int flag, int argc,
+                                  char *const argv[])
 {
        u32 key_handle, err;
        u8 usage_auth[DIGEST_LENGTH];
@@ -490,8 +493,8 @@ static int do_tpm_get_pub_key_oiap(cmd_tbl_t *cmdtp, int flag, int argc,
                return CMD_RET_FAILURE;
        parse_byte_string(argv[2], usage_auth, NULL);
 
-       err = tpm_get_pub_key_oiap(dev, key_handle, usage_auth, pub_key_buffer,
-                                  &pub_key_len);
+       err = tpm1_get_pub_key_oiap(dev, key_handle, usage_auth, pub_key_buffer,
+                                   &pub_key_len);
        if (!err) {
                printf("dump of received pub key structure:\n");
                print_byte_string(pub_key_buffer, pub_key_len);
@@ -499,13 +502,13 @@ static int do_tpm_get_pub_key_oiap(cmd_tbl_t *cmdtp, int flag, int argc,
        return report_return_code(err);
 }
 
-TPM_COMMAND_NO_ARG(tpm_end_oiap)
+TPM_COMMAND_NO_ARG(tpm1_end_oiap)
 
 #endif /* CONFIG_TPM_AUTH_SESSIONS */
 
 #ifdef CONFIG_TPM_FLUSH_RESOURCES
-static int do_tpm_flush(cmd_tbl_t *cmdtp, int flag, int argc,
-                       char * const argv[])
+static int do_tpm_flush(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
 {
        struct udevice *dev;
        int type = 0;
@@ -561,7 +564,7 @@ static int do_tpm_flush(cmd_tbl_t *cmdtp, int flag, int argc,
                res_count = get_unaligned_be16(buf);
                ptr = buf + 2;
                for (i = 0; i < res_count; ++i, ptr += 4)
-                       tpm_flush_specific(dev, get_unaligned_be32(ptr), type);
+                       tpm1_flush_specific(dev, get_unaligned_be32(ptr), type);
        } else {
                u32 handle = simple_strtoul(argv[2], NULL, 0);
 
@@ -569,7 +572,7 @@ static int do_tpm_flush(cmd_tbl_t *cmdtp, int flag, int argc,
                        printf("Illegal resource handle %s\n", argv[2]);
                        return -1;
                }
-               tpm_flush_specific(dev, cpu_to_be32(handle), type);
+               tpm1_flush_specific(dev, cpu_to_be32(handle), type);
        }
 
        return 0;
@@ -577,9 +580,10 @@ static int do_tpm_flush(cmd_tbl_t *cmdtp, int flag, int argc,
 #endif /* CONFIG_TPM_FLUSH_RESOURCES */
 
 #ifdef CONFIG_TPM_LIST_RESOURCES
-static int do_tpm_list(cmd_tbl_t *cmdtp, int flag, int argc,
-                      char * const argv[])
+static int do_tpm_list(struct cmd_tbl *cmdtp, int flag, int argc,
+                      char *const argv[])
 {
+       struct udevice *dev;
        int type = 0;
        u16 res_count;
        u8 buf[288];
@@ -587,6 +591,10 @@ static int do_tpm_list(cmd_tbl_t *cmdtp, int flag, int argc,
        int err;
        uint i;
 
+       err = get_tpm(&dev);
+       if (err)
+               return err;
+
        if (argc != 2)
                return CMD_RET_USAGE;
 
@@ -617,7 +625,7 @@ static int do_tpm_list(cmd_tbl_t *cmdtp, int flag, int argc,
        }
 
        /* fetch list of already loaded resources in the TPM */
-       err = tpm_get_capability(TPM_CAP_HANDLE, type, buf,
+       err = tpm_get_capability(dev, TPM_CAP_HANDLE, type, buf,
                                 sizeof(buf));
        if (err) {
                printf("tpm_get_capability returned error %d.\n", err);
@@ -644,8 +652,10 @@ TPM_COMMAND_NO_ARG(tpm_force_clear)
 TPM_COMMAND_NO_ARG(tpm_physical_enable)
 TPM_COMMAND_NO_ARG(tpm_physical_disable)
 
-static cmd_tbl_t tpm1_commands[] = {
+static struct cmd_tbl tpm1_commands[] = {
+       U_BOOT_CMD_MKENT(device, 0, 1, do_tpm_device, "", ""),
        U_BOOT_CMD_MKENT(info, 0, 1, do_tpm_info, "", ""),
+       U_BOOT_CMD_MKENT(autostart, 0, 1, do_tpm_autostart, "", ""),
        U_BOOT_CMD_MKENT(init, 0, 1, do_tpm_init, "", ""),
        U_BOOT_CMD_MKENT(startup, 0, 1,
                         do_tpm_startup, "", ""),
@@ -689,7 +699,7 @@ static cmd_tbl_t tpm1_commands[] = {
        U_BOOT_CMD_MKENT(oiap, 0, 1,
                         do_tpm_oiap, "", ""),
        U_BOOT_CMD_MKENT(end_oiap, 0, 1,
-                        do_tpm_end_oiap, "", ""),
+                        do_tpm1_end_oiap, "", ""),
        U_BOOT_CMD_MKENT(load_key2_oiap, 0, 1,
                         do_tpm_load_key2_oiap, "", ""),
 #ifdef CONFIG_TPM_LOAD_KEY_BY_SHA1
@@ -709,7 +719,7 @@ static cmd_tbl_t tpm1_commands[] = {
 #endif /* CONFIG_TPM_LIST_RESOURCES */
 };
 
-cmd_tbl_t *get_tpm1_commands(unsigned int *size)
+struct cmd_tbl *get_tpm1_commands(unsigned int *size)
 {
        *size = ARRAY_SIZE(tpm1_commands);
 
@@ -721,10 +731,15 @@ U_BOOT_CMD(tpm, CONFIG_SYS_MAXARGS, 1, do_tpm,
 "cmd args...\n"
 "    - Issue TPM command <cmd> with arguments <args...>.\n"
 "Admin Startup and State Commands:\n"
+"  device [num device]\n"
+"    - Show all devices or set the specified device\n"
 "  info - Show information about the TPM\n"
+"  autostart\n"
+"    - Initalize the tpm, perform a Startup(clear) and run a full selftest\n"
+"      sequence\n"
 "  init\n"
 "    - Put TPM into a state where it waits for 'startup' command.\n"
-"  startup mode\n"
+"      startup mode\n"
 "    - Issue TPM_Starup command.  <mode> is one of TPM_ST_CLEAR,\n"
 "      TPM_ST_STATE, and TPM_ST_DEACTIVATED.\n"
 "Admin Testing Commands:\n"