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.9-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.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 975094ddc369a32f27210248bdd9bbd153061b00 Mon Sep 17 00:00:00 2001 From: Peter Huewe <peter.huewe@xxxxxxxxxxxx> 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@xxxxxxxxxxxx> 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@xxxxxxxxxxxx> Signed-off-by: Peter Huewe <peter.huewe@xxxxxxxxxxxx> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx> Tested-by: Benoit Houyere <benoit.houyere@xxxxxx> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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 @@ -102,6 +102,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@xxxxxxxxxxxx are queue-4.9/tpm_tis_spi-abort-transfer-when-too-many-wait-states-are-signaled.patch queue-4.9/tpm_tis_spi-remove-limitation-of-transfers-to-max_spi_framesize-bytes.patch queue-4.9/tpm_tis_core-choose-appropriate-timeout-for-reading-burstcount.patch queue-4.9/tpm_tis_spi-add-small-delay-after-last-transfer.patch queue-4.9/tpm_tis_spi-check-correct-byte-for-wait-state-indicator.patch queue-4.9/tpm_tis_spi-use-single-function-to-transfer-data.patch