[tpmdd-devel] tpm: print tpm error code in hex for TPM2.0 devices

Submitted by Jerry Snitselaar on April 26, 2017, 10:39 p.m.

Details

Message ID 20170426223954.18365-1-jsnitsel@redhat.com
State New
Headers show

Commit Message

Jerry Snitselaar April 26, 2017, 10:39 p.m.
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@linux.intel.com>
Cc: Peter Huewe <peterhuewe@gmx.de>
Cc: Marcel Selhorst <tpmdd@selhorst.net>
Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reported-by: Ken Goldman <kgoldman@us.ibm.com>
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
---
 drivers/char/tpm/tpm-interface.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Comments

Jarkko Sakkinen April 28, 2017, 12:01 p.m.
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@linux.intel.com>
> Cc: Peter Huewe <peterhuewe@gmx.de>
> Cc: Marcel Selhorst <tpmdd@selhorst.net>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Reported-by: Ken Goldman <kgoldman@us.ibm.com>
> Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
> ---
>  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

Patch hide | download patch | download mbox

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;