From: <gregkh@linuxfoundation.org>
To: peter.huewe@infineon.com, Alexander.Steffen@infineon.com,
benoit.houyere@st.com, gregkh@linuxfoundation.org,
jarkko.sakkinen@linux.intel.com
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "tpm_tis_spi: Abort transfer when too many wait states are signaled" has been added to the 4.11-stable tree
Date: Mon, 22 May 2017 18:06:03 +0200 [thread overview]
Message-ID: <1495469163186150@kroah.com> (raw)
This is a note to let you know that I've just added the patch titled
tpm_tis_spi: Abort transfer when too many wait states are signaled
to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tpm_tis_spi-abort-transfer-when-too-many-wait-states-are-signaled.patch
and it can be found in the queue-4.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From 975094ddc369a32f27210248bdd9bbd153061b00 Mon Sep 17 00:00:00 2001
From: Peter Huewe <peter.huewe@infineon.com>
Date: Thu, 2 Mar 2017 13:03:12 +0000
Subject: tpm_tis_spi: Abort transfer when too many wait states are signaled
From: Peter Huewe <peter.huewe@infineon.com>
commit 975094ddc369a32f27210248bdd9bbd153061b00 upstream.
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.
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>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Benoit Houyere <benoit.houyere@st.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/char/tpm/tpm_tis_spi.c | 5 +++++
1 file changed, 5 insertions(+)
--- 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 t
goto exit;
}
+ if (i == TPM_RETRY) {
+ ret = -ETIMEDOUT;
+ goto exit;
+ }
+
spi_xfer.cs_change = 0;
spi_xfer.len = len;
Patches currently in stable-queue which might be from peter.huewe@infineon.com are
queue-4.11/tpm_tis_spi-abort-transfer-when-too-many-wait-states-are-signaled.patch
queue-4.11/tpm_tis_spi-remove-limitation-of-transfers-to-max_spi_framesize-bytes.patch
queue-4.11/tpm_tis_core-choose-appropriate-timeout-for-reading-burstcount.patch
queue-4.11/tpm_tis_spi-add-small-delay-after-last-transfer.patch
queue-4.11/tpm_tis_spi-check-correct-byte-for-wait-state-indicator.patch
queue-4.11/tpm_tis_spi-use-single-function-to-transfer-data.patch
reply other threads:[~2017-05-22 16:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1495469163186150@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=Alexander.Steffen@infineon.com \
--cc=benoit.houyere@st.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=peter.huewe@infineon.com \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.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 NNTP newsgroup(s).