From: christophe.ricard <christophe.ricard@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 18/25] tpm: Report tpm errors on the command line
Date: Tue, 11 Aug 2015 23:43:10 +0200 [thread overview]
Message-ID: <55CA6C6E.3070001@gmail.com> (raw)
In-Reply-To: <1439304497-10081-19-git-send-email-sjg@chromium.org>
Hi Simon,
Good one !
Acked-by: Christophe Ricard <christophe-h.ricard@st.com>
Best Regards
Christophe
On 11/08/2015 16:48, Simon Glass wrote:
> When a 'tpm' command fails, we set the return code but give no indication
> of failure. This can be confusing.
>
> Add an error message when any tpm command fails.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> common/cmd_tpm.c | 46 ++++++++++++++++++++++++----------------------
> 1 file changed, 24 insertions(+), 22 deletions(-)
>
> diff --git a/common/cmd_tpm.c b/common/cmd_tpm.c
> index 274e3cd..f48ab04 100644
> --- a/common/cmd_tpm.c
> +++ b/common/cmd_tpm.c
> @@ -80,17 +80,19 @@ static void *parse_byte_string(char *bytes, uint8_t *data, size_t *count_ptr)
> }
>
> /**
> - * Convert TPM command return code to U-Boot command error codes.
> + * report_return_code() - Report any error and return failure or success
> *
> * @param return_code TPM command return code
> * @return value of enum command_ret_t
> */
> -static int convert_return_code(uint32_t return_code)
> +static int report_return_code(int return_code)
> {
> - if (return_code)
> + if (return_code < 0) {
> + printf("Error: %d\n", return_code);
> return CMD_RET_FAILURE;
> - else
> + } else {
> return CMD_RET_SUCCESS;
> + }
> }
>
> /**
> @@ -252,7 +254,7 @@ static int do_tpm_startup(cmd_tbl_t *cmdtp, int flag,
> return CMD_RET_FAILURE;
> }
>
> - return convert_return_code(tpm_startup(mode));
> + return report_return_code(tpm_startup(mode));
> }
>
> static int do_tpm_nv_define_space(cmd_tbl_t *cmdtp, int flag,
> @@ -266,7 +268,7 @@ static int do_tpm_nv_define_space(cmd_tbl_t *cmdtp, int flag,
> perm = simple_strtoul(argv[2], NULL, 0);
> size = simple_strtoul(argv[3], NULL, 0);
>
> - return convert_return_code(tpm_nv_define_space(index, perm, size));
> + return report_return_code(tpm_nv_define_space(index, perm, size));
> }
>
> static int do_tpm_nv_read_value(cmd_tbl_t *cmdtp, int flag,
> @@ -287,7 +289,7 @@ static int do_tpm_nv_read_value(cmd_tbl_t *cmdtp, int flag,
> print_byte_string(data, count);
> }
>
> - return convert_return_code(rc);
> + return report_return_code(rc);
> }
>
> static int do_tpm_nv_write_value(cmd_tbl_t *cmdtp, int flag,
> @@ -309,7 +311,7 @@ static int do_tpm_nv_write_value(cmd_tbl_t *cmdtp, int flag,
> rc = tpm_nv_write_value(index, data, count);
> free(data);
>
> - return convert_return_code(rc);
> + return report_return_code(rc);
> }
>
> static int do_tpm_extend(cmd_tbl_t *cmdtp, int flag,
> @@ -332,7 +334,7 @@ static int do_tpm_extend(cmd_tbl_t *cmdtp, int flag,
> print_byte_string(out_digest, sizeof(out_digest));
> }
>
> - return convert_return_code(rc);
> + return report_return_code(rc);
> }
>
> static int do_tpm_pcr_read(cmd_tbl_t *cmdtp, int flag,
> @@ -353,7 +355,7 @@ static int do_tpm_pcr_read(cmd_tbl_t *cmdtp, int flag,
> print_byte_string(data, count);
> }
>
> - return convert_return_code(rc);
> + return report_return_code(rc);
> }
>
> static int do_tpm_tsc_physical_presence(cmd_tbl_t *cmdtp, int flag,
> @@ -365,7 +367,7 @@ static int do_tpm_tsc_physical_presence(cmd_tbl_t *cmdtp, int flag,
> return CMD_RET_USAGE;
> presence = (uint16_t)simple_strtoul(argv[1], NULL, 0);
>
> - return convert_return_code(tpm_tsc_physical_presence(presence));
> + return report_return_code(tpm_tsc_physical_presence(presence));
> }
>
> static int do_tpm_read_pubek(cmd_tbl_t *cmdtp, int flag,
> @@ -385,7 +387,7 @@ static int do_tpm_read_pubek(cmd_tbl_t *cmdtp, int flag,
> print_byte_string(data, count);
> }
>
> - return convert_return_code(rc);
> + return report_return_code(rc);
> }
>
> static int do_tpm_physical_set_deactivated(cmd_tbl_t *cmdtp, int flag,
> @@ -397,7 +399,7 @@ static int do_tpm_physical_set_deactivated(cmd_tbl_t *cmdtp, int flag,
> return CMD_RET_USAGE;
> state = (uint8_t)simple_strtoul(argv[1], NULL, 0);
>
> - return convert_return_code(tpm_physical_set_deactivated(state));
> + return report_return_code(tpm_physical_set_deactivated(state));
> }
>
> static int do_tpm_get_capability(cmd_tbl_t *cmdtp, int flag,
> @@ -420,7 +422,7 @@ static int do_tpm_get_capability(cmd_tbl_t *cmdtp, int flag,
> print_byte_string(cap, count);
> }
>
> - return convert_return_code(rc);
> + return report_return_code(rc);
> }
>
> #define TPM_COMMAND_NO_ARG(cmd) \
> @@ -429,7 +431,7 @@ static int do_##cmd(cmd_tbl_t *cmdtp, int flag, \
> { \
> if (argc != 1) \
> return CMD_RET_USAGE; \
> - return convert_return_code(cmd()); \
> + return report_return_code(cmd()); \
> }
>
> TPM_COMMAND_NO_ARG(tpm_init)
> @@ -485,7 +487,7 @@ static int do_tpm_raw_transfer(cmd_tbl_t *cmdtp, int flag,
> print_byte_string(response, response_length);
> }
>
> - return convert_return_code(rc);
> + return report_return_code(rc);
> }
>
> static int do_tpm_nv_define(cmd_tbl_t *cmdtp, int flag,
> @@ -503,7 +505,7 @@ static int do_tpm_nv_define(cmd_tbl_t *cmdtp, int flag,
> index = simple_strtoul(argv[2], NULL, 0);
> perm = simple_strtoul(argv[3], NULL, 0);
>
> - return convert_return_code(tpm_nv_define_space(index, perm, size));
> + return report_return_code(tpm_nv_define_space(index, perm, size));
> }
>
> static int do_tpm_nv_read(cmd_tbl_t *cmdtp, int flag,
> @@ -532,7 +534,7 @@ static int do_tpm_nv_read(cmd_tbl_t *cmdtp, int flag,
> }
> free(data);
>
> - return convert_return_code(err);
> + return report_return_code(err);
> }
>
> static int do_tpm_nv_write(cmd_tbl_t *cmdtp, int flag,
> @@ -560,7 +562,7 @@ static int do_tpm_nv_write(cmd_tbl_t *cmdtp, int flag,
> err = tpm_nv_write_value(index, data, count);
> free(data);
>
> - return convert_return_code(err);
> + return report_return_code(err);
> }
>
> #ifdef CONFIG_TPM_AUTH_SESSIONS
> @@ -572,7 +574,7 @@ static int do_tpm_oiap(cmd_tbl_t *cmdtp, int flag,
>
> err = tpm_oiap(&auth_handle);
>
> - return convert_return_code(err);
> + return report_return_code(err);
> }
>
> static int do_tpm_load_key2_oiap(cmd_tbl_t *cmdtp, int flag,
> @@ -597,7 +599,7 @@ static int do_tpm_load_key2_oiap(cmd_tbl_t *cmdtp, int flag,
> if (!err)
> printf("Key handle is 0x%x\n", key_handle);
>
> - return convert_return_code(err);
> + return report_return_code(err);
> }
>
> static int do_tpm_get_pub_key_oiap(cmd_tbl_t *cmdtp, int flag,
> @@ -622,7 +624,7 @@ static int do_tpm_get_pub_key_oiap(cmd_tbl_t *cmdtp, int flag,
> printf("dump of received pub key structure:\n");
> print_byte_string(pub_key_buffer, pub_key_len);
> }
> - return convert_return_code(err);
> + return report_return_code(err);
> }
>
> TPM_COMMAND_NO_ARG(tpm_end_oiap)
next prev parent reply other threads:[~2015-08-11 21:43 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-11 14:47 [U-Boot] [PATCH 00/25] dm: Convert TPM drivers to driver model Simon Glass
2015-08-11 14:47 ` [U-Boot] [PATCH 01/25] tpm: Remove old pre-driver-model I2C code Simon Glass
2015-08-11 21:41 ` christophe.ricard
2015-08-13 1:30 ` Simon Glass
2015-08-11 14:47 ` [U-Boot] [PATCH 02/25] tpm: Drop two unused options Simon Glass
2015-08-11 21:44 ` christophe.ricard
2015-08-11 14:47 ` [U-Boot] [PATCH 03/25] tpm: Add Kconfig options for TPMs Simon Glass
2015-08-11 21:45 ` christophe.ricard
2015-08-13 1:30 ` Simon Glass
2015-08-11 14:47 ` [U-Boot] [PATCH 04/25] tpm: Convert board config TPM options to Kconfig Simon Glass
2015-08-11 21:45 ` christophe.ricard
2015-08-11 14:47 ` [U-Boot] [PATCH 05/25] tpm: Convert drivers to use SPDX Simon Glass
2015-08-11 21:41 ` christophe.ricard
2015-08-11 14:47 ` [U-Boot] [PATCH 06/25] tpm: Move the I2C TPM code into one file Simon Glass
2015-08-11 21:42 ` christophe.ricard
2015-08-13 1:30 ` Simon Glass
2015-08-13 20:26 ` Christophe Ricard
2015-08-11 14:47 ` [U-Boot] [PATCH 07/25] tpm: tpm_tis_i2c: Drop unnecessary methods Simon Glass
2015-08-11 21:47 ` christophe.ricard
2015-08-13 1:30 ` Simon Glass
2015-08-13 20:28 ` Christophe Ricard
2015-08-13 22:53 ` Simon Glass
2015-08-11 14:48 ` [U-Boot] [PATCH 08/25] tpm: tpm_tis_i2c: Drop struct tpm_vendor_specific Simon Glass
2015-08-11 21:47 ` christophe.ricard
2015-08-13 1:30 ` Simon Glass
2015-08-13 20:32 ` Christophe Ricard
2015-08-13 22:53 ` Simon Glass
2015-08-11 14:48 ` [U-Boot] [PATCH 09/25] tpm: tpm_tis_i2c: Merge struct tpm_dev into tpm_chip Simon Glass
2015-08-11 21:46 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 10/25] tpm: tpm_tis_i2c: Merge struct tpm " Simon Glass
2015-08-11 21:46 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 11/25] tpm: tpm_tis_i2c: Move definitions into the header file Simon Glass
2015-08-11 21:45 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 12/25] tpm: tpm_tis_i2c: Simplify init code Simon Glass
2015-08-11 21:45 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 13/25] tpm: tpm_tis_i2c: Use a consistent tpm_tis_i2c_ prefix Simon Glass
2015-08-11 21:44 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 14/25] tpm: tpm_tis_i2c: Tidy up delays Simon Glass
2015-08-11 21:44 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 15/25] dm: tpm: Add a uclass for Trusted Platform Modules Simon Glass
2015-08-11 21:44 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 16/25] dm: tpm: Convert the TPM command and library to driver model Simon Glass
2015-08-11 21:43 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 17/25] dm: i2c: Add a command to adjust the offset length Simon Glass
2015-08-11 14:48 ` [U-Boot] [PATCH 18/25] tpm: Report tpm errors on the command line Simon Glass
2015-08-11 21:43 ` christophe.ricard [this message]
2015-08-11 14:48 ` [U-Boot] [PATCH 19/25] dm: tpm: sandbox: Convert TPM driver to driver model Simon Glass
2015-08-11 21:42 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 20/25] tpm: Check that parse_byte_string() has data to parse Simon Glass
2015-08-11 21:42 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 21/25] exynos: x86: dts: Add tpm nodes to the device tree for Chrome OS devices Simon Glass
2015-08-11 14:48 ` [U-Boot] [PATCH 22/25] dm: tpm: Convert I2C driver to driver model Simon Glass
2015-08-11 21:41 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 23/25] dm: tpm: Convert LPC " Simon Glass
2015-08-11 21:41 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 24/25] tpm: Add a 'tpm info' command Simon Glass
2015-08-11 21:40 ` christophe.ricard
2015-08-11 14:48 ` [U-Boot] [PATCH 25/25] tegra: nyan: Enable TPM command and driver Simon Glass
2015-08-11 21:40 ` christophe.ricard
2015-08-11 21:50 ` [U-Boot] [PATCH 00/25] dm: Convert TPM drivers to driver model christophe.ricard
2015-08-13 1:30 ` Simon Glass
2015-08-13 20:22 ` Christophe Ricard
2015-08-13 22:52 ` Simon Glass
2015-08-20 21:39 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55CA6C6E.3070001@gmail.com \
--to=christophe.ricard@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox