Commit 949692da authored by Jacqueline Wong's avatar Jacqueline Wong Committed by Jarkko Sakkinen
Browse files

tpm: tpm_tis: stop transmit if retries are exhausted 



tpm_tis_send_main() will attempt to retry sending data TPM_RETRY times.
Currently, if those retries are exhausted, the driver will attempt to
call execute. The TPM will be in the wrong state, leading to the
operation simply timing out.

Instead, if there is still an error after retries are exhausted, return
that error immediately.

Cc: stable@vger.kernel.org # v6.6+
Fixes: 280db21e ("tpm_tis: Resend command to recover from data transfer errors")
Signed-off-by: default avatarJacqueline Wong <jacqwong@google.com>
Signed-off-by: default avatarJordan Hand <jhand@google.com>
Link: https://lore.kernel.org/r/20260415160006.2275325-3-jacqwong@google.com


Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent 0471921e

drivers/char/tpm/tpm_tis_core.c

+6 −1
Original line number Diff line number Diff line
@@ -556,11 +556,16 @@ static int tpm_tis_send_main(struct tpm_chip *chip, const u8 *buf, size_t len) 
			break;

		else if (rc != -EAGAIN && rc != -EIO)

			/* Data transfer failed, not recoverable */

			return rc;

			goto out_err;



		usleep_range(priv->timeout_min, priv->timeout_max);

	}



	if (rc == -EAGAIN || rc == -EIO) {

		dev_err(&chip->dev, "Exhausted %d tpm_tis_send_data retries\n", TPM_RETRY);

		goto out_err;

	}



	/* go and do it */

	rc = tpm_tis_write8(priv, TPM_STS(priv->locality), TPM_STS_GO);

	if (rc < 0)