From: Alexander Steffen <Alexander.Steffen-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org>
To: jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org,
tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Subject: [PATCH RESEND 2/3] tpm-chip: Return TPM error codes from auto_startup functions
Date: Thu, 24 Aug 2017 10:37:13 +0200 [thread overview]
Message-ID: <20170824083714.10016-3-Alexander.Steffen@infineon.com> (raw)
In-Reply-To: <20170824083714.10016-1-Alexander.Steffen-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org>
The auto_startup functions for TPM1 and TPM2 convert all TPM error codes to
ENODEV on exit. But since there is only one caller for those functions,
this code can be consolidated within the caller. Additionally, this allows
the caller to distinguish between a TPM being present (but returning error
responses for some commands) and no TPM being present (or the TPM
malfunctioning completely).
Signed-off-by: Alexander Steffen <Alexander.Steffen-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org>
---
drivers/char/tpm/tpm-chip.c | 4 +++-
drivers/char/tpm/tpm-interface.c | 6 ++----
drivers/char/tpm/tpm2-cmd.c | 5 ++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index a353b7a..f20fcb7 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -404,8 +404,10 @@ int tpm_chip_register(struct tpm_chip *chip)
rc = tpm2_auto_startup(chip);
else
rc = tpm1_auto_startup(chip);
- if (rc)
+ if (rc < 0)
return rc;
+ else if (rc > 0)
+ return -ENODEV;
}
tpm_sysfs_add_device(chip);
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 78fb41d..fe11f2a 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -1000,7 +1000,8 @@ EXPORT_SYMBOL_GPL(tpm_do_selftest);
* sequence
* @chip: TPM chip to use
*
- * Returns 0 on success, < 0 in case of fatal error.
+ * Returns 0 on success, < 0 in case of fatal error or a value > 0 representing
+ * a TPM error code.
*/
int tpm1_auto_startup(struct tpm_chip *chip)
{
@@ -1015,10 +1016,7 @@ int tpm1_auto_startup(struct tpm_chip *chip)
goto out;
}
- return rc;
out:
- if (rc > 0)
- rc = -ENODEV;
return rc;
}
diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index e1a41b7..54a3123 100644
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -1074,7 +1074,8 @@ static int tpm2_get_cc_attrs_tbl(struct tpm_chip *chip)
* sequence
* @chip: TPM chip to use
*
- * Returns 0 on success, < 0 in case of fatal error.
+ * Returns 0 on success, < 0 in case of fatal error or a value > 0 representing
+ * a TPM error code.
*/
int tpm2_auto_startup(struct tpm_chip *chip)
{
@@ -1109,8 +1110,6 @@ int tpm2_auto_startup(struct tpm_chip *chip)
rc = tpm2_get_cc_attrs_tbl(chip);
out:
- if (rc > 0)
- rc = -ENODEV;
return rc;
}
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
next prev parent reply other threads:[~2017-08-24 8:37 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-24 8:37 [PATCH RESEND 0/3] Export broken TPMs to user space Alexander Steffen
[not found] ` <20170824083714.10016-1-Alexander.Steffen-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org>
2017-08-24 8:37 ` [PATCH RESEND 1/3] tpm-chip: Move idr_replace calls to appropriate places Alexander Steffen
2017-08-25 17:25 ` Jarkko Sakkinen
[not found] ` <20170825172546.f4bl2wh7tgbyjx2n-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-08-28 17:18 ` Alexander.Steffen-d0qZbvYSIPpWk0Htik3J/w
2017-08-24 8:37 ` Alexander Steffen [this message]
[not found] ` <20170824083714.10016-3-Alexander.Steffen-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org>
2017-08-25 17:06 ` [PATCH RESEND 2/3] tpm-chip: Return TPM error codes from auto_startup functions Jarkko Sakkinen
[not found] ` <20170825170607.wfnr5y5zres2n42r-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-08-29 12:11 ` Alexander.Steffen-d0qZbvYSIPpWk0Htik3J/w
2017-08-24 8:37 ` [PATCH RESEND 3/3] tpm-chip: Export TPM device to user space even when startup failed Alexander Steffen
2017-08-25 17:20 ` Jarkko Sakkinen
[not found] ` <20170825172021.lw3ycxqw63ubrcm2-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-08-28 17:15 ` Alexander.Steffen-d0qZbvYSIPpWk0Htik3J/w
2017-08-29 12:55 ` Jarkko Sakkinen
2017-08-29 13:17 ` [tpmdd-devel] " Michal Suchánek
[not found] ` <20170829151739.315ae581-6hIufAJW0g4CVLCxKZUutA@public.gmane.org>
2017-08-29 13:53 ` Peter Huewe
2017-08-30 10:26 ` [tpmdd-devel] " Jarkko Sakkinen
2017-08-30 10:15 ` Jarkko Sakkinen
2017-08-30 10:20 ` [tpmdd-devel] " Jarkko Sakkinen
2017-08-30 10:34 ` Michal Suchánek
2017-08-30 11:07 ` Jarkko Sakkinen
2017-08-31 16:18 ` Alexander.Steffen
2017-09-02 10:20 ` Jarkko Sakkinen
[not found] ` <20170830101510.rlkh2p3zecfsrhgl-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-08-30 10:41 ` Peter Huewe
2017-08-30 11:10 ` [tpmdd-devel] " Jarkko Sakkinen
2017-08-31 16:26 ` Alexander.Steffen
2017-09-02 10:24 ` Jarkko Sakkinen
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=20170824083714.10016-3-Alexander.Steffen@infineon.com \
--to=alexander.steffen-d0qzbvysippwk0htik3j/w@public.gmane.org \
--cc=jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
--cc=tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).