From: Alexey Klimov <aklimov@redhat.com>
To: linux-integrity@vger.kernel.org
Cc: jsnitsel@redhat.com, jarkko.sakkinen@linux.intel.com,
peterhuewe@gmx.de, jgg@ziepe.ca, aklimov@redhat.com
Subject: [PATCH REVIEW 1/2] tpm: provide a way to override the chip returned durations
Date: Fri, 14 Dec 2018 13:21:14 +0000 [thread overview]
Message-ID: <20181214132115.26223-1-aklimov@redhat.com> (raw)
Patch adds method ->update_durations to override returned
durations in case TPM chip misbehaves for TPM 1.2 drivers.
Cc: Jerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: Alexey Klimov <aklimov@redhat.com>
---
drivers/char/tpm/tpm-interface.c | 18 ++++++++++++++++++
include/linux/tpm.h | 2 ++
2 files changed, 20 insertions(+)
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 129f640424b7..5cb90918938d 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -768,6 +768,7 @@ int tpm_get_timeouts(struct tpm_chip *chip)
{
cap_t cap;
unsigned long timeout_old[4], timeout_chip[4], timeout_eff[4];
+ unsigned long durations[3];
ssize_t rc;
if (chip->flags & TPM_CHIP_FLAG_HAVE_TIMEOUTS)
@@ -877,6 +878,23 @@ int tpm_get_timeouts(struct tpm_chip *chip)
usecs_to_jiffies(be32_to_cpu(cap.duration.tpm_long));
chip->duration[TPM_LONG_LONG] = 0; /* not used under 1.2 */
+ /*
+ * Provide ability for vendor overrides of duration values in case
+ * of misreporting.
+ */
+ if (chip->ops->update_durations != NULL)
+ chip->duration_adjusted =
+ chip->ops->update_durations(chip, durations);
+
+ /* Report and set adjusted timeouts */
+ if (chip->duration_adjusted) {
+
+ dev_info(&chip->dev, HW_ERR "Adjusting reported durations\n");
+ chip->duration[TPM_SHORT] = durations[0];
+ chip->duration[TPM_MEDIUM] = durations[1];
+ chip->duration[TPM_LONG] = durations[2];
+ }
+
/* The Broadcom BCM0102 chipset in a Dell Latitude D820 gets the above
* value wrong and apparently reports msecs rather than usecs. So we
* fix up the resulting too-small TPM_SHORT value to make things work.
diff --git a/include/linux/tpm.h b/include/linux/tpm.h
index 4609b94142d4..d6018431b478 100644
--- a/include/linux/tpm.h
+++ b/include/linux/tpm.h
@@ -43,6 +43,8 @@ struct tpm_class_ops {
u8 (*status) (struct tpm_chip *chip);
bool (*update_timeouts)(struct tpm_chip *chip,
unsigned long *timeout_cap);
+ bool (*update_durations)(struct tpm_chip *chip,
+ unsigned long *durations_cap);
int (*go_idle)(struct tpm_chip *chip);
int (*cmd_ready)(struct tpm_chip *chip);
int (*request_locality)(struct tpm_chip *chip, int loc);
--
2.14.4
next reply other threads:[~2018-12-14 13:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-14 13:21 Alexey Klimov [this message]
2018-12-14 13:21 ` [PATCH REVIEW 2/2] tpm_tis: override durations for STM tpm with firmware 1.2.8.28 Alexey Klimov
2019-01-03 13:14 ` Jarkko Sakkinen
2019-01-14 19:39 ` Jerry Snitselaar
2019-01-18 14:59 ` Jarkko Sakkinen
2019-01-20 21:30 ` Jerry Snitselaar
2019-01-21 12:29 ` Jarkko Sakkinen
2019-01-03 13:05 ` [PATCH REVIEW 1/2] tpm: provide a way to override the chip returned durations 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=20181214132115.26223-1-aklimov@redhat.com \
--to=aklimov@redhat.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgg@ziepe.ca \
--cc=jsnitsel@redhat.com \
--cc=linux-integrity@vger.kernel.org \
--cc=peterhuewe@gmx.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;
as well as URLs for NNTP newsgroup(s).