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 57D9D40F8E9 for ; Fri, 8 May 2026 17:24:34 +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=1778261074; cv=none; b=GjHktPGXbEm9jpNYf773INEfp2UIfWyiklMTJbU4kQTkWm9FDYtNXA2e9UcYkyIzpkgqHDKrpHlP2GW4oozLmIfQUMCzDRlnpQDmEKDO9dVbV3odfQg08Op9kpxEz3wSRa28a4XiFnEmTv3IOPIGU6YdbuFRAUKoYx7sb56pstk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778261074; c=relaxed/simple; bh=mvkLQNeWDS2moqpVaGupJ0lB6VciE0m5x9bggPvysys=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rEll0uK+EXbuJpRz0IxcEsppm5dHarI18m5zVp/Lyo5BkcmmDh9OwIU2hsF2m04xkt7H0yS8GqfgJVWvsT9GhgVo+qHsnPzNB5G3Ao9sfO+pTPeMWEBkdCyJu3ry7f3C744pHHtRUzhZsod58lFolVXkGoaI2TI7Jjra2bCicYQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RUiBrmFC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RUiBrmFC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 801F1C2BCF5; Fri, 8 May 2026 17:24:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778261074; bh=mvkLQNeWDS2moqpVaGupJ0lB6VciE0m5x9bggPvysys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RUiBrmFC8dOHXNkMWCO4PiBK6OWtPu2KJQxkgDnKYUydemn+TqKkE9Kq5dawl1JFu Nlhb9z3iZBI6Vcj9oalisYQA4GORynev2ctjsVRUf6tRWdCqzb91Z7hQsUFtS3Fi9d JUXqAOJjQG7N4790otUdFOON8V5l7lPmCYUYaW/FtCxbdGvxm/v/COPq9qzM75q9Yq uDcZs87uWaN8AsaXv70BILKu6nfv7GHs6LedCVw89U+Q/kvQqS4yI8qTrjDA7XqsND rchjdkVdNqrPlCQCUncNNq/eJj5G4LadkWqjPIAudjOXWsErhzrfaqCkNUUInD8XGy av65+wLxCgt0w== From: Sasha Levin To: stable@vger.kernel.org Cc: Jacqueline Wong , Jordan Hand , Jarkko Sakkinen , Sasha Levin Subject: [PATCH 6.1.y 2/2] tpm: tpm_tis: stop transmit if retries are exhausted Date: Fri, 8 May 2026 13:24:29 -0400 Message-ID: <20260508172429.1767444-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260508172429.1767444-1-sashal@kernel.org> References: <2026050324-jump-diploma-db0f@gregkh> <20260508172429.1767444-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jacqueline Wong [ Upstream commit 949692da7211572fac419b2986b6abc0cd1aeb76 ] 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: Sasha Levin --- drivers/char/tpm/tpm_tis_core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index 88a85aff3cb82..74d051151dc2b 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -518,11 +518,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) -- 2.53.0