projects / oweals / u-boot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
cmd: mvebu: bubt: fix quoted string split across lines
[oweals/u-boot.git] / cmd / tpm-v2.c
diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
index 38add4f4622c46946dbf313159dac877715dffd3..0cd39821bfff41c905113e0782e98ecef9c52ebe 100644 (file)
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -16,7 +16,12 @@ static int do_tpm2_startup(cmd_tbl_t *cmdtp, int flag, int argc,
                           char * const argv[])
 {
        enum tpm2_startup_types mode;
+       struct udevice *dev;
+       int ret;
 
+       ret = get_tpm(&dev);
+       if (ret)
+               return ret;
        if (argc != 2)
                return CMD_RET_USAGE;
 
@@ -29,14 +34,19 @@ static int do_tpm2_startup(cmd_tbl_t *cmdtp, int flag, int argc,
                return CMD_RET_FAILURE;
        }
 
-       return report_return_code(tpm2_startup(mode));
+       return report_return_code(tpm2_startup(dev, mode));
 }
 
 static int do_tpm2_self_test(cmd_tbl_t *cmdtp, int flag, int argc,
                             char * const argv[])
 {
        enum tpm2_yes_no full_test;
+       struct udevice *dev;
+       int ret;
 
+       ret = get_tpm(&dev);
+       if (ret)
+               return ret;
        if (argc != 2)
                return CMD_RET_USAGE;
 
@@ -49,7 +59,7 @@ static int do_tpm2_self_test(cmd_tbl_t *cmdtp, int flag, int argc,
                return CMD_RET_FAILURE;
        }
 
-       return report_return_code(tpm2_self_test(full_test));
+       return report_return_code(tpm2_self_test(dev, full_test));
 }
 
 static int do_tpm2_clear(cmd_tbl_t *cmdtp, int flag, int argc,
@@ -58,6 +68,12 @@ static int do_tpm2_clear(cmd_tbl_t *cmdtp, int flag, int argc,
        u32 handle = 0;
        const char *pw = (argc < 3) ? NULL : argv[2];
        const ssize_t pw_sz = pw ? strlen(pw) : 0;
+       struct udevice *dev;
+       int ret;
+
+       ret = get_tpm(&dev);
+       if (ret)
+               return ret;
 
        if (argc < 2 || argc > 3)
                return CMD_RET_USAGE;
@@ -72,7 +88,7 @@ static int do_tpm2_clear(cmd_tbl_t *cmdtp, int flag, int argc,
        else
                return CMD_RET_USAGE;
 
-       return report_return_code(tpm2_clear(handle, pw, pw_sz));
+       return report_return_code(tpm2_clear(dev, handle, pw, pw_sz));
 }
 
 static int do_tpm2_pcr_extend(cmd_tbl_t *cmdtp, int flag, int argc,
@@ -88,7 +104,7 @@ static int do_tpm2_pcr_extend(cmd_tbl_t *cmdtp, int flag, int argc,
        if (argc != 3)
                return CMD_RET_USAGE;
 
-       ret = uclass_first_device_err(UCLASS_TPM, &dev);
+       ret = get_tpm(&dev);
        if (ret)
                return ret;
 
@@ -99,7 +115,7 @@ static int do_tpm2_pcr_extend(cmd_tbl_t *cmdtp, int flag, int argc,
        if (index >= priv->pcr_count)
                return -EINVAL;
 
-       rc = tpm2_pcr_extend(index, digest);
+       rc = tpm2_pcr_extend(dev, index, digest);
 
        unmap_sysmem(digest);
 
@@ -119,7 +135,7 @@ static int do_tpm_pcr_read(cmd_tbl_t *cmdtp, int flag, int argc,
        if (argc != 3)
                return CMD_RET_USAGE;
 
-       ret = uclass_first_device_err(UCLASS_TPM, &dev);
+       ret = get_tpm(&dev);
        if (ret)
                return ret;
 
@@ -133,9 +149,9 @@ static int do_tpm_pcr_read(cmd_tbl_t *cmdtp, int flag, int argc,
 
        data = map_sysmem(simple_strtoul(argv[2], NULL, 0), 0);
 
-       rc = tpm2_pcr_read(index, priv->pcr_select_min, data, &updates);
+       rc = tpm2_pcr_read(dev, index, priv->pcr_select_min, data, &updates);
        if (!rc) {
-               printf("PCR #%u content (%d known updates):\n", index, updates);
+               printf("PCR #%u content (%u known updates):\n", index, updates);
                print_byte_string(data, TPM2_DIGEST_LEN);
        }
 
@@ -151,6 +167,12 @@ static int do_tpm_get_capability(cmd_tbl_t *cmdtp, int flag, int argc,
        u8 *data;
        size_t count;
        int i, j;
+       struct udevice *dev;
+       int ret;
+
+       ret = get_tpm(&dev);
+       if (ret)
+               return ret;
 
        if (argc != 5)
                return CMD_RET_USAGE;
@@ -160,7 +182,7 @@ static int do_tpm_get_capability(cmd_tbl_t *cmdtp, int flag, int argc,
        data = map_sysmem(simple_strtoul(argv[3], NULL, 0), 0);
        count = simple_strtoul(argv[4], NULL, 0);
 
-       rc = tpm2_get_capability(capability, property, data, count);
+       rc = tpm2_get_capability(dev, capability, property, data, count);
        if (rc)
                goto unmap_data;
 
@@ -186,6 +208,12 @@ static int do_tpm_dam_reset(cmd_tbl_t *cmdtp, int flag, int argc,
 {
        const char *pw = (argc < 2) ? NULL : argv[1];
        const ssize_t pw_sz = pw ? strlen(pw) : 0;
+       struct udevice *dev;
+       int ret;
+
+       ret = get_tpm(&dev);
+       if (ret)
+               return ret;
 
        if (argc > 2)
                return CMD_RET_USAGE;
@@ -193,7 +221,7 @@ static int do_tpm_dam_reset(cmd_tbl_t *cmdtp, int flag, int argc,
        if (pw_sz > TPM2_DIGEST_LEN)
                return -EINVAL;
 
-       return report_return_code(tpm2_dam_reset(pw, pw_sz));
+       return report_return_code(tpm2_dam_reset(dev, pw, pw_sz));
 }
 
 static int do_tpm_dam_parameters(cmd_tbl_t *cmdtp, int flag, int argc,
@@ -208,6 +236,12 @@ static int do_tpm_dam_parameters(cmd_tbl_t *cmdtp, int flag, int argc,
        unsigned long int max_tries;
        unsigned long int recovery_time;
        unsigned long int lockout_recovery;
+       struct udevice *dev;
+       int ret;
+
+       ret = get_tpm(&dev);
+       if (ret)
+               return ret;
 
        if (argc < 4 || argc > 5)
                return CMD_RET_USAGE;
@@ -229,7 +263,7 @@ static int do_tpm_dam_parameters(cmd_tbl_t *cmdtp, int flag, int argc,
        log(LOGC_NONE, LOGL_INFO, "- recoveryTime: %lu\n", recovery_time);
        log(LOGC_NONE, LOGL_INFO, "- lockoutRecovery: %lu\n", lockout_recovery);
 
-       return report_return_code(tpm2_dam_parameters(pw, pw_sz, max_tries,
+       return report_return_code(tpm2_dam_parameters(dev, pw, pw_sz, max_tries,
                                                      recovery_time,
                                                      lockout_recovery));
 }
@@ -242,6 +276,12 @@ static int do_tpm_change_auth(cmd_tbl_t *cmdtp, int flag, int argc,
        const char *oldpw = (argc == 3) ? NULL : argv[3];
        const ssize_t newpw_sz = strlen(newpw);
        const ssize_t oldpw_sz = oldpw ? strlen(oldpw) : 0;
+       struct udevice *dev;
+       int ret;
+
+       ret = get_tpm(&dev);
+       if (ret)
+               return ret;
 
        if (argc < 3 || argc > 4)
                return CMD_RET_USAGE;
@@ -260,7 +300,7 @@ static int do_tpm_change_auth(cmd_tbl_t *cmdtp, int flag, int argc,
        else
                return CMD_RET_USAGE;
 
-       return report_return_code(tpm2_change_auth(handle, newpw, newpw_sz,
+       return report_return_code(tpm2_change_auth(dev, handle, newpw, newpw_sz,
                                                   oldpw, oldpw_sz));
 }
 
@@ -271,6 +311,12 @@ static int do_tpm_pcr_setauthpolicy(cmd_tbl_t *cmdtp, int flag, int argc,
        char *key = argv[2];
        const char *pw = (argc < 4) ? NULL : argv[3];
        const ssize_t pw_sz = pw ? strlen(pw) : 0;
+       struct udevice *dev;
+       int ret;
+
+       ret = get_tpm(&dev);
+       if (ret)
+               return ret;
 
        if (strlen(key) != TPM2_DIGEST_LEN)
                return -EINVAL;
@@ -278,7 +324,7 @@ static int do_tpm_pcr_setauthpolicy(cmd_tbl_t *cmdtp, int flag, int argc,
        if (argc < 3 || argc > 4)
                return CMD_RET_USAGE;
 
-       return report_return_code(tpm2_pcr_setauthpolicy(pw, pw_sz, index,
+       return report_return_code(tpm2_pcr_setauthpolicy(dev, pw, pw_sz, index,
                                                         key));
 }
 
@@ -290,6 +336,12 @@ static int do_tpm_pcr_setauthvalue(cmd_tbl_t *cmdtp, int flag,
        const ssize_t key_sz = strlen(key);
        const char *pw = (argc < 4) ? NULL : argv[3];
        const ssize_t pw_sz = pw ? strlen(pw) : 0;
+       struct udevice *dev;
+       int ret;
+
+       ret = get_tpm(&dev);
+       if (ret)
+               return ret;
 
        if (strlen(key) != TPM2_DIGEST_LEN)
                return -EINVAL;
@@ -297,11 +349,12 @@ static int do_tpm_pcr_setauthvalue(cmd_tbl_t *cmdtp, int flag,
        if (argc < 3 || argc > 4)
                return CMD_RET_USAGE;
 
-       return report_return_code(tpm2_pcr_setauthvalue(pw, pw_sz, index,
+       return report_return_code(tpm2_pcr_setauthvalue(dev, pw, pw_sz, index,
                                                        key, key_sz));
 }
 
 static cmd_tbl_t tpm2_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(init, 0, 1, do_tpm_init, "", ""),
        U_BOOT_CMD_MKENT(startup, 0, 1, do_tpm2_startup, "", ""),
@@ -319,16 +372,18 @@ static cmd_tbl_t tpm2_commands[] = {
                         do_tpm_pcr_setauthvalue, "", ""),
 };
 
-cmd_tbl_t *get_tpm_commands(unsigned int *size)
+cmd_tbl_t *get_tpm2_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",
+U_BOOT_CMD(tpm2, CONFIG_SYS_MAXARGS, 1, do_tpm, "Issue a TPMv2.x command",
 "<command> [<arguments>]\n"
 "\n"
+"device [num device]\n"
+"    Show all devices or set the specified device\n"
 "info\n"
 "    Show information about the TPM.\n"
 "init\n"
Unnamed repository; edit this file 'description' to name the repository.