From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 883B53DE443; Mon, 4 May 2026 14:23:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777904630; cv=none; b=sc9MStpzjkfOtyOHFMgtPl2c9ywwJh4dIvP7YQfg8UbCIcJDrNkfaqyuBpBqL2zPkGupXu1beJkMLujBdIyGQHpLw7dHUD6QxANnZiFvV/k4d5f6LzDS4ZXOHZZRrIbUW8i9gUz9hJ5XDM7BVuVwRL6URUkLq8GoWKCtueQJxpY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777904630; c=relaxed/simple; bh=8Ncoj6kzljLjrImjLeuJjOJWACpdfSo3ggxjyA84VyI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CXIZ6FUgKpR/9Njy7DfaT/C+Q8oUySZQAqAsqg9+qeSki1RB90/KYFKr7hsjpXN9HLJQ1esnYYBcDIG/mWk9vJs+yxG6B95QLI3z6ZoNX+nq88F7dJ2tn2eBMrD4XfVPILvVtztSjoMc95VPMPDl3JigsDABs4vot85VZD/DT7w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uxHBcJRT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="uxHBcJRT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6285C2BCFA; Mon, 4 May 2026 14:23:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777904630; bh=8Ncoj6kzljLjrImjLeuJjOJWACpdfSo3ggxjyA84VyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uxHBcJRT7VQpzMlohkeVjxYiTLwUYVcmiytkns7+Nre31tQ6MTxjv1h7dcoDN7Hsa zJ67TsqB6x5h6XRxjh2hK34K1oP1PWB+30UjlxjLwM+a8U++HFECHFEfM4+QMp8JTz QQaQy/LbIgLcbal31iuqovUcPNBDKnE08yKgGNpo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jacqueline Wong , Jordan Hand , Jarkko Sakkinen Subject: [PATCH 6.12 114/215] tpm: tpm_tis: stop transmit if retries are exhausted Date: Mon, 4 May 2026 15:52:13 +0200 Message-ID: <20260504135134.315487036@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260504135130.169210693@linuxfoundation.org> References: <20260504135130.169210693@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jacqueline Wong commit 949692da7211572fac419b2986b6abc0cd1aeb76 upstream. 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: 280db21e153d8 ("tpm_tis: Resend command to recover from data transfer errors") Signed-off-by: Jacqueline Wong Signed-off-by: Jordan Hand Link: https://lore.kernel.org/r/20260415160006.2275325-3-jacqwong@google.com Signed-off-by: Jarkko Sakkinen Signed-off-by: Greg Kroah-Hartman --- drivers/char/tpm/tpm_tis_core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -557,11 +557,16 @@ static int tpm_tis_send_main(struct tpm_ 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)