From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Peter Huewe <peter.huewe@infineon.com>
Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org,
peterhuewe@gmx.de,
Alexander Steffen <Alexander.Steffen@infineon.com>,
stable@vger.kernel.org
Subject: Re: [PATCH] tpm_tis_core: Choose appropriate timeout for reading burstcount
Date: Fri, 24 Feb 2017 19:41:34 +0200 [thread overview]
Message-ID: <20170224174134.sxtyh553bsyca6la@intel.com> (raw)
In-Reply-To: <1487259216-28955-1-git-send-email-peter.huewe@infineon.com>
On Thu, Feb 16, 2017 at 03:33:36PM +0000, Peter Huewe wrote:
> From: Alexander Steffen <Alexander.Steffen@infineon.com>
>
> TIS v1.3 for TPM 1.2 and PTP for TPM 2.0 disagree about which timeout
> value applies to reading a valid burstcount. It is TIMEOUT_D according to
> TIS, but TIMEOUT_A according to PTP, so choose the appropriate value
> depending on whether we deal with a TPM 1.2 or a TPM 2.0.
>
> This is important since according to the PTP TIMEOUT_D is much smaller
> than TIMEOUT_A. So the previous implementation could run into timeouts
> with a TPM 2.0, even though the TPM was behaving perfectly fine.
>
> During tpm2_probe TIMEOUT_D will be used even with a TPM 2.0, because
> TPM_CHIP_FLAG_TPM2 is not yet set. This is fine, since the timeout values
> will only be changed afterwards by tpm_get_timeouts. Until then
> TIS_TIMEOUT_D_MAX applies, which is large enough.
>
> Cc: stable@vger.kernel.org
> Fixes: aec04cbdf723 ("tpm: TPM 2.0 FIFO Interface")
>
> Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com>
> Signed-off-by: Peter Huewe <peter.huewe@infineon.com>
Pushed.
/Jarkko
> ---
> drivers/char/tpm/tpm_tis_core.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index c0f296b5d413..fc0e9a2734ed 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -160,8 +160,10 @@ static int get_burstcount(struct tpm_chip *chip)
> u32 value;
>
> /* wait for burstcount */
> - /* which timeout value, spec has 2 answers (c & d) */
> - stop = jiffies + chip->timeout_d;
> + if (chip->flags & TPM_CHIP_FLAG_TPM2)
> + stop = jiffies + chip->timeout_a;
> + else
> + stop = jiffies + chip->timeout_d;
> do {
> rc = tpm_tis_read32(priv, TPM_STS(priv->locality), &value);
> if (rc < 0)
> --
> 2.7.4
>
prev parent reply other threads:[~2017-02-24 17:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-16 15:33 [PATCH] tpm_tis_core: Choose appropriate timeout for reading burstcount Peter Huewe
2017-02-22 21:13 ` Jarkko Sakkinen
2017-02-24 17:41 ` Jarkko Sakkinen [this message]
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=20170224174134.sxtyh553bsyca6la@intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=Alexander.Steffen@infineon.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.huewe@infineon.com \
--cc=peterhuewe@gmx.de \
--cc=stable@vger.kernel.org \
--cc=tpmdd-devel@lists.sourceforge.net \
/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).