From: Peter Huewe <peter.huewe@infineon.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
<tpmdd-devel@lists.sourceforge.net>,
<linux-kernel@vger.kernel.org>, <peterhuewe@gmx.de>,
Christophe Ricard <christophe-h.ricard@st.com>,
"Peter Huewe" <peter.huewe@infineon.com>,
<stable@vger.kernel.org>,
Alexander Steffen <Alexander.Steffen@infineon.com>
Subject: [PATCH 2/5] tpm_tis_spi: Abort transfer when too many wait states are signaled
Date: Thu, 16 Feb 2017 16:08:23 +0000 [thread overview]
Message-ID: <1487261306-2494-3-git-send-email-peter.huewe@infineon.com> (raw)
In-Reply-To: <1487261306-2494-1-git-send-email-peter.huewe@infineon.com>
Abort the transfer with ETIMEDOUT when the TPM signals more than
TPM_RETRY wait states. Continuing with the transfer in this state
will only lead to arbitrary failures in other parts of the code.
Cc: <stable@vger.kernel.org>
Fixes: 0edbfea537d1 ("tpm/tpm_tis_spi: Add support for spi phy")
Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com>
Signed-off-by: Peter Huewe <peter.huewe@infineon.com>
---
drivers/char/tpm/tpm_tis_spi.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/char/tpm/tpm_tis_spi.c b/drivers/char/tpm/tpm_tis_spi.c
index 6e1a3c43f621..d782b9974c14 100644
--- a/drivers/char/tpm/tpm_tis_spi.c
+++ b/drivers/char/tpm/tpm_tis_spi.c
@@ -101,6 +101,11 @@ static int tpm_tis_spi_transfer(struct tpm_tis_data *data, u32 addr, u8 len,
goto exit;
}
+ if (i == TPM_RETRY) {
+ ret = -ETIMEDOUT;
+ goto exit;
+ }
+
spi_xfer.cs_change = 0;
spi_xfer.len = len;
--
2.7.4
next prev parent reply other threads:[~2017-02-16 16:09 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-16 16:08 [PATCH 0/5] Fix whole native SPI TPM driver Peter Huewe
2017-02-16 16:08 ` [PATCH 1/5] tpm_tis_spi: Use single function to transfer data Peter Huewe
2017-02-24 12:54 ` Jarkko Sakkinen
2017-02-16 16:08 ` Peter Huewe [this message]
2017-02-17 5:04 ` [PATCH 2/5] tpm_tis_spi: Abort transfer when too many wait states are signaled Christophe Ricard
2017-02-24 12:55 ` Jarkko Sakkinen
2017-02-16 16:08 ` [PATCH 3/5] tpm_tis_spi: Check correct byte for wait state indicator Peter Huewe
2017-02-17 5:09 ` Christophe Ricard
2017-02-17 7:15 ` Peter Huewe
2017-02-24 12:57 ` Jarkko Sakkinen
2017-02-16 16:08 ` [PATCH 4/5] tpm_tis_spi: Remove limitation of transfers to MAX_SPI_FRAMESIZE bytes Peter Huewe
2017-02-16 17:27 ` kbuild test robot
2017-02-17 5:11 ` Christophe Ricard
2017-02-17 7:19 ` Peter Huewe
2017-02-24 11:55 ` Jarkko Sakkinen
2017-02-24 12:59 ` Jarkko Sakkinen
2017-02-22 21:19 ` [PATCH 0/5] Fix whole native SPI TPM driver Jarkko Sakkinen
2017-02-22 22:32 ` Peter Huewe
2017-02-24 15:15 ` 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=1487261306-2494-3-git-send-email-peter.huewe@infineon.com \
--to=peter.huewe@infineon.com \
--cc=Alexander.Steffen@infineon.com \
--cc=christophe-h.ricard@st.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=linux-kernel@vger.kernel.org \
--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).