* [PATCH] tpm: print tpm error code in hex for TPM2.0 devices
@ 2017-04-26 22:39 Jerry Snitselaar
[not found] ` <20170426223954.18365-1-jsnitsel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Jerry Snitselaar @ 2017-04-26 22:39 UTC (permalink / raw)
To: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA
For easier decoding, output the error code returned
from the tpm device in hex when the device is TPM2.0.
Cc: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Cc: Peter Huewe <peterhuewe-Mmb7MZpHnFY@public.gmane.org>
Cc: Marcel Selhorst <tpmdd-yWjUBOtONefk1uMJSBkQmQ@public.gmane.org>
Cc: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
Reported-by: Ken Goldman <kgoldman-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Jerry Snitselaar <jsnitsel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
drivers/char/tpm/tpm-interface.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index bd2128e0b56c..b6c67eef9ae7 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -453,9 +453,14 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, const void *buf,
return -EFAULT;
err = be32_to_cpu(header->return_code);
- if (err != 0 && desc)
- dev_err(&chip->dev, "A TPM error (%d) occurred %s\n", err,
- desc);
+ if (err != 0 && desc) {
+ if (chip->flags & TPM_CHIP_FLAG_TPM2)
+ dev_err(&chip->dev, "A TPM 2.0 error (0x%x) occurred %s\n",
+ err, desc);
+ else
+ dev_err(&chip->dev, "A TPM error (%d) occurred %s\n",
+ err, desc);
+ }
if (err)
return err;
--
2.13.0.rc0.45.ge2cb6ab84
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
^ permalink raw reply related [flat|nested] 4+ messages in thread[parent not found: <20170426223954.18365-1-jsnitsel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH] tpm: print tpm error code in hex for TPM2.0 devices [not found] ` <20170426223954.18365-1-jsnitsel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> @ 2017-04-28 12:01 ` Jarkko Sakkinen [not found] ` <20170428120149.jjxwbp6nmthk4y3q-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> 0 siblings, 1 reply; 4+ messages in thread From: Jarkko Sakkinen @ 2017-04-28 12:01 UTC (permalink / raw) To: Jerry Snitselaar Cc: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f, linux-kernel-u79uwXL29TY76Z2rM5mHXA On Wed, Apr 26, 2017 at 03:39:54PM -0700, Jerry Snitselaar wrote: > For easier decoding, output the error code returned > from the tpm device in hex when the device is TPM2.0. > > Cc: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > Cc: Peter Huewe <peterhuewe-Mmb7MZpHnFY@public.gmane.org> > Cc: Marcel Selhorst <tpmdd-yWjUBOtONefk1uMJSBkQmQ@public.gmane.org> > Cc: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org> > Reported-by: Ken Goldman <kgoldman-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> > Signed-off-by: Jerry Snitselaar <jsnitsel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > --- > drivers/char/tpm/tpm-interface.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > index bd2128e0b56c..b6c67eef9ae7 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -453,9 +453,14 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, const void *buf, > return -EFAULT; > > err = be32_to_cpu(header->return_code); > - if (err != 0 && desc) > - dev_err(&chip->dev, "A TPM error (%d) occurred %s\n", err, > - desc); > + if (err != 0 && desc) { > + if (chip->flags & TPM_CHIP_FLAG_TPM2) > + dev_err(&chip->dev, "A TPM 2.0 error (0x%x) occurred %s\n", > + err, desc); > + else > + dev_err(&chip->dev, "A TPM error (%d) occurred %s\n", > + err, desc); > + } Is there a reason for not to apply this also to TPM 1.2? /Jarkko > if (err) > return err; > > -- > 2.13.0.rc0.45.ge2cb6ab84 > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <20170428120149.jjxwbp6nmthk4y3q-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH] tpm: print tpm error code in hex for TPM2.0 devices [not found] ` <20170428120149.jjxwbp6nmthk4y3q-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> @ 2017-04-28 17:18 ` Jerry Snitselaar 2017-04-29 11:17 ` Jarkko Sakkinen 0 siblings, 1 reply; 4+ messages in thread From: Jerry Snitselaar @ 2017-04-28 17:18 UTC (permalink / raw) To: Jarkko Sakkinen Cc: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f, linux-kernel-u79uwXL29TY76Z2rM5mHXA On Fri Apr 28 17, Jarkko Sakkinen wrote: >On Wed, Apr 26, 2017 at 03:39:54PM -0700, Jerry Snitselaar wrote: >> For easier decoding, output the error code returned >> from the tpm device in hex when the device is TPM2.0. >> >> Cc: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> >> Cc: Peter Huewe <peterhuewe-Mmb7MZpHnFY@public.gmane.org> >> Cc: Marcel Selhorst <tpmdd-yWjUBOtONefk1uMJSBkQmQ@public.gmane.org> >> Cc: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org> >> Reported-by: Ken Goldman <kgoldman-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> >> Signed-off-by: Jerry Snitselaar <jsnitsel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> >> --- >> drivers/char/tpm/tpm-interface.c | 11 ++++++++--- >> 1 file changed, 8 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c >> index bd2128e0b56c..b6c67eef9ae7 100644 >> --- a/drivers/char/tpm/tpm-interface.c >> +++ b/drivers/char/tpm/tpm-interface.c >> @@ -453,9 +453,14 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, const void *buf, >> return -EFAULT; >> >> err = be32_to_cpu(header->return_code); >> - if (err != 0 && desc) >> - dev_err(&chip->dev, "A TPM error (%d) occurred %s\n", err, >> - desc); >> + if (err != 0 && desc) { >> + if (chip->flags & TPM_CHIP_FLAG_TPM2) >> + dev_err(&chip->dev, "A TPM 2.0 error (0x%x) occurred %s\n", >> + err, desc); >> + else >> + dev_err(&chip->dev, "A TPM error (%d) occurred %s\n", >> + err, desc); >> + } > >Is there a reason for not to apply this also to TPM 1.2? > >/Jarkko > The 2.0 spec lists the response codes in hex, while the 1.2 spec lists them in decimal. Maybe something like the following instead? index 158c1db83f05..1f433d56f53c 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -526,8 +526,8 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, err = be32_to_cpu(header->return_code); if (err != 0 && desc) - dev_err(&chip->dev, "A TPM error (%d) occurred %s\n", err, - desc); + dev_err(&chip->dev, "A TPM error (%d (0x%x)) occurred %s\n", err, + err, desc); if (err) return err; >> if (err) >> return err; >> >> -- >> 2.13.0.rc0.45.ge2cb6ab84 >> ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] tpm: print tpm error code in hex for TPM2.0 devices 2017-04-28 17:18 ` Jerry Snitselaar @ 2017-04-29 11:17 ` Jarkko Sakkinen 0 siblings, 0 replies; 4+ messages in thread From: Jarkko Sakkinen @ 2017-04-29 11:17 UTC (permalink / raw) To: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Peter Huewe, Marcel Selhorst, Jason Gunthorpe On Fri, Apr 28, 2017 at 10:18:09AM -0700, Jerry Snitselaar wrote: > On Fri Apr 28 17, Jarkko Sakkinen wrote: > > On Wed, Apr 26, 2017 at 03:39:54PM -0700, Jerry Snitselaar wrote: > > > For easier decoding, output the error code returned > > > from the tpm device in hex when the device is TPM2.0. > > > > > > Cc: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > > > Cc: Peter Huewe <peterhuewe-Mmb7MZpHnFY@public.gmane.org> > > > Cc: Marcel Selhorst <tpmdd-yWjUBOtONefk1uMJSBkQmQ@public.gmane.org> > > > Cc: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org> > > > Reported-by: Ken Goldman <kgoldman-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> > > > Signed-off-by: Jerry Snitselaar <jsnitsel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > > > --- > > > drivers/char/tpm/tpm-interface.c | 11 ++++++++--- > > > 1 file changed, 8 insertions(+), 3 deletions(-) > > > > > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > > > index bd2128e0b56c..b6c67eef9ae7 100644 > > > --- a/drivers/char/tpm/tpm-interface.c > > > +++ b/drivers/char/tpm/tpm-interface.c > > > @@ -453,9 +453,14 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, const void *buf, > > > return -EFAULT; > > > > > > err = be32_to_cpu(header->return_code); > > > - if (err != 0 && desc) > > > - dev_err(&chip->dev, "A TPM error (%d) occurred %s\n", err, > > > - desc); > > > + if (err != 0 && desc) { > > > + if (chip->flags & TPM_CHIP_FLAG_TPM2) > > > + dev_err(&chip->dev, "A TPM 2.0 error (0x%x) occurred %s\n", > > > + err, desc); > > > + else > > > + dev_err(&chip->dev, "A TPM error (%d) occurred %s\n", > > > + err, desc); > > > + } > > > > Is there a reason for not to apply this also to TPM 1.2? > > > > /Jarkko > > > > The 2.0 spec lists the response codes in hex, while the 1.2 spec lists them > in decimal. Maybe something like the following instead? Ah. Well, I thinkthe original patch is fine then. Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> /Jarkko > > index 158c1db83f05..1f433d56f53c 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -526,8 +526,8 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, > > err = be32_to_cpu(header->return_code); > if (err != 0 && desc) > - dev_err(&chip->dev, "A TPM error (%d) occurred %s\n", err, > - desc); > + dev_err(&chip->dev, "A TPM error (%d (0x%x)) occurred %s\n", err, > + err, desc); > if (err) > return err; > > > > > if (err) > > > return err; > > > > > > -- > > > 2.13.0.rc0.45.ge2cb6ab84 > > > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-29 11:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-26 22:39 [PATCH] tpm: print tpm error code in hex for TPM2.0 devices Jerry Snitselaar
[not found] ` <20170426223954.18365-1-jsnitsel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-04-28 12:01 ` Jarkko Sakkinen
[not found] ` <20170428120149.jjxwbp6nmthk4y3q-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-04-28 17:18 ` Jerry Snitselaar
2017-04-29 11:17 ` Jarkko Sakkinen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).