From: Alexander Steffen <Alexander.Steffen@infineon.com>
To: <jarkko@kernel.org>, <linux-integrity@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: Alexander Steffen <Alexander.Steffen@infineon.com>
Subject: [PATCH 4/4] tpm_tis: Resend command to recover from data transfer errors
Date: Mon, 5 Jun 2023 19:52:50 +0200 [thread overview]
Message-ID: <20230605175250.2055-5-Alexander.Steffen@infineon.com> (raw)
In-Reply-To: <20230605175250.2055-1-Alexander.Steffen@infineon.com>
Similar to the transmission of TPM responses, also the transmission of TPM
commands may become corrupted. Instead of aborting when detecting such
issues, try resending the command again.
Change-Id: Ifad9cccff94b59242d36fba9c1e92c7a6bb57804
Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com>
---
drivers/char/tpm/tpm_tis_core.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index a08768e55803..47073cc79b51 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -535,10 +535,18 @@ static int tpm_tis_send_main(struct tpm_chip *chip, const u8 *buf, size_t len)
int rc;
u32 ordinal;
unsigned long dur;
+ unsigned int try;
- rc = tpm_tis_send_data(chip, buf, len);
- if (rc < 0)
- return rc;
+ for (try = 0; try < TPM_RETRY; try++) {
+ rc = tpm_tis_send_data(chip, buf, len);
+ if (rc >= 0) {
+ /* Data transfer done successfully */
+ break;
+ } else if (rc != -EIO) {
+ /* Data transfer failed, not recoverable */
+ return rc;
+ }
+ }
/* go and do it */
rc = tpm_tis_write8(priv, TPM_STS(priv->locality), TPM_STS_GO);
--
2.34.1
prev parent reply other threads:[~2023-06-05 17:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-05 17:52 [PATCH 0/4] Recovery from data transfer errors for tpm_tis Alexander Steffen
2023-06-05 17:52 ` [PATCH 1/4] tpm_tis: Explicitly check for error code Alexander Steffen
2023-06-05 17:52 ` [PATCH 2/4] tpm_tis: Move CRC check to generic send routine Alexander Steffen
2023-06-05 17:52 ` [PATCH 3/4] tpm_tis: Use responseRetry to recover from data transfer errors Alexander Steffen
2023-06-05 17:52 ` Alexander Steffen [this message]
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=20230605175250.2055-5-Alexander.Steffen@infineon.com \
--to=alexander.steffen@infineon.com \
--cc=jarkko@kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@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