| Message ID | 20211104011253.4401-2-matt@traverse.com.au |
|---|---|
| State | Superseded |
| Delegated to: | Eugen Hristev |
| Headers | show |
| Series | Fix Atmel/Microchip TPMv1.2 issues | expand |
Hi Mathew, On Thu, 4 Nov 2021 at 03:14, Mathew McBride <matt@traverse.com.au> wrote: > > This command is not compiled by default and was not > updated to pass the udevice to tpm_get_capability. > > Signed-off-by: Mathew McBride <matt@traverse.com.au> > --- > cmd/tpm-v1.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c > index 3a7e35d525..55f2aeff46 100644 > --- a/cmd/tpm-v1.c > +++ b/cmd/tpm-v1.c > @@ -582,6 +582,7 @@ static int do_tpm_flush(struct cmd_tbl *cmdtp, int flag, int argc, > 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]; > @@ -589,6 +590,10 @@ static int do_tpm_list(struct cmd_tbl *cmdtp, int flag, int argc, > int err; > uint i; > > + err = get_tpm(&dev); > + if (err) > + return err; > + > if (argc != 2) > return CMD_RET_USAGE; > > @@ -619,7 +624,7 @@ static int do_tpm_list(struct cmd_tbl *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); > -- > 2.30.1 > Thanks for fixing this, indeed I missed the tpm1.2 changes :( Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c index 3a7e35d525..55f2aeff46 100644 --- a/cmd/tpm-v1.c +++ b/cmd/tpm-v1.c @@ -582,6 +582,7 @@ static int do_tpm_flush(struct cmd_tbl *cmdtp, int flag, int argc, 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]; @@ -589,6 +590,10 @@ static int do_tpm_list(struct cmd_tbl *cmdtp, int flag, int argc, int err; uint i; + err = get_tpm(&dev); + if (err) + return err; + if (argc != 2) return CMD_RET_USAGE; @@ -619,7 +624,7 @@ static int do_tpm_list(struct cmd_tbl *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);
This command is not compiled by default and was not updated to pass the udevice to tpm_get_capability. Signed-off-by: Mathew McBride <matt@traverse.com.au> --- cmd/tpm-v1.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)