From: Dmitry Torokhov <dtor@chromium.org>
To: Andrey Pronin <apronin@chromium.org>
Cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
Peter Huewe <peterhuewe@gmx.de>,
Marcel Selhorst <tpmdd@selhorst.net>,
Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org,
Christophe Ricard <christophe.ricard@gmail.com>,
smbarber@chromium.org, dianders@chromium.org
Subject: Re: [PATCH v3 1/2] tpm_tis_core: add optional max xfer size check
Date: Thu, 28 Jul 2016 15:52:50 -0700 [thread overview]
Message-ID: <20160728225250.GA28623@dtor-ws> (raw)
In-Reply-To: <1469677797-74304-2-git-send-email-apronin@chromium.org>
On Wed, Jul 27, 2016 at 08:49:56PM -0700, Andrey Pronin wrote:
> If tpm reports a bigger burstcnt than allowed by the physical protocol,
> set burstcnt to the max allowed value.
>
> In practice, seen in case of xfer issues (e.g. in spi interface case,
> lost header causing flow control issues and wrong values returned on read
> from TPM_STS). Without catching, causes the physical layer to reject xfer.
>
> Signed-off-by: Andrey Pronin <apronin@chromium.org>
> ---
> drivers/char/tpm/tpm_tis_core.c | 9 ++++++++-
> drivers/char/tpm/tpm_tis_core.h | 1 +
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index f22caf8..7c4fa0c 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -168,8 +168,15 @@ static int get_burstcount(struct tpm_chip *chip)
> return rc;
>
> burstcnt = (value >> 8) & 0xFFFF;
> - if (burstcnt)
> + if (burstcnt) {
> + if (priv->phy_ops->max_xfer_size &&
> + (burstcnt > priv->phy_ops->max_xfer_size)) {
This does not actually need parentheses, otehrwise:
Reviewed-by: Dmitry Torokhov <dtor@chromium.org>
> + dev_warn(&chip->dev,
> + "Bad burstcnt read: %d\n", burstcnt);
> + burstcnt = priv->phy_ops->max_xfer_size;
> + }
> return burstcnt;
> + }
> msleep(TPM_TIMEOUT);
> } while (time_before(jiffies, stop));
> return -EBUSY;
> diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h
> index 9191aab..58e8b14 100644
> --- a/drivers/char/tpm/tpm_tis_core.h
> +++ b/drivers/char/tpm/tpm_tis_core.h
> @@ -102,6 +102,7 @@ struct tpm_tis_phy_ops {
> int (*read16)(struct tpm_tis_data *data, u32 addr, u16 *result);
> int (*read32)(struct tpm_tis_data *data, u32 addr, u32 *result);
> int (*write32)(struct tpm_tis_data *data, u32 addr, u32 src);
> + u16 max_xfer_size;
> };
>
> static inline int tpm_tis_read_bytes(struct tpm_tis_data *data, u32 addr,
> --
> 2.6.6
>
--
Dmitry
next prev parent reply other threads:[~2016-07-28 22:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 1:39 [PATCH 0/2] tpm: add optional max xfer size check Andrey Pronin
2016-07-15 1:39 ` [PATCH 1/2] tpm_tis_core: " Andrey Pronin
2016-07-15 3:13 ` Jason Gunthorpe
2016-07-15 3:25 ` Andrey Pronin
2016-07-15 3:48 ` Guenter Roeck
2016-07-18 18:53 ` Jarkko Sakkinen
2016-07-15 1:39 ` [PATCH 2/2] tpm_tis_spi: add max xfer size Andrey Pronin
2016-07-20 2:34 ` [PATCH v2 0/2] tpm: add optional max xfer size check Andrey Pronin
2016-07-20 2:34 ` [PATCH v2 1/2] tpm_tis_core: " Andrey Pronin
2016-07-20 2:34 ` [PATCH v2 2/2] tpm_tis_spi: add max xfer size Andrey Pronin
2016-07-20 15:10 ` [PATCH v2 0/2] tpm: add optional max xfer size check Jarkko Sakkinen
2016-07-28 3:49 ` [PATCH v3 " Andrey Pronin
2016-07-28 3:49 ` [PATCH v3 1/2] tpm_tis_core: " Andrey Pronin
2016-07-28 22:52 ` Dmitry Torokhov [this message]
2016-08-09 8:14 ` Jarkko Sakkinen
2016-07-28 3:49 ` [PATCH v3 2/2] tpm_tis_spi: add max xfer size Andrey Pronin
2016-07-28 22:53 ` Dmitry Torokhov
2016-08-09 8:14 ` 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=20160728225250.GA28623@dtor-ws \
--to=dtor@chromium.org \
--cc=apronin@chromium.org \
--cc=christophe.ricard@gmail.com \
--cc=dianders@chromium.org \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=smbarber@chromium.org \
--cc=tpmdd-devel@lists.sourceforge.net \
--cc=tpmdd@selhorst.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).