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 1C40E22F3BE; Mon, 19 May 2025 21:22:36 +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=1747689756; cv=none; b=rs4qqBDhxQ69TsvjBbHUiD9Qa7RVktZmYNwUMBKDa9xU+wtaK9uv1BUmZVcMWZMWm4nBu1S/15X2xJddN2snLo04tAynSB67OPWSMbABDmuwhLzU2FkhNVzJZamwuSRUWeHEWsD+A3Bujb+EFulBu5uqe5+M7lyFviLpOE1pwhQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747689756; c=relaxed/simple; bh=EQ3IzvGXf0ucRDNdpCAmCBBVswJOtl92Ip02snCfp7s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=T/MJTvyhyJ07AfKIQE6Q7mm6ROfUGC54503oBNsX/7IL3SBxozduk8USPPgu0Cc3ZE69EqyNGhLwZ/G6Zc4eiFaYiExm8Qop4XDkg1kmpfh32ij74+E7lSIzMGG8JSSgsRHQLcgv7aK1x7GTImL7NV4+r3x9qSY4k50WrVjYm+Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Xx9z6vyN; 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="Xx9z6vyN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0557C4CEF2; Mon, 19 May 2025 21:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747689755; bh=EQ3IzvGXf0ucRDNdpCAmCBBVswJOtl92Ip02snCfp7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xx9z6vyNl85/VVfqlJokDeCRCk0Ih62/VjREc/tCK2vr89QRwRdhbk7A+X+0TGixc MTMfWsA0FM8/C3HX5rNZ+FfFZ+X1LEkjSqZziBb34vWU+TVqhavsRQUVtLr22NJTcX BENUwT6v2txlYyPrPPTAHTeMY77rYLL2ZGuT6Umy4uO2I/lka5wpgMuE/HH1FWv0K4 iu5yxA+Ro7ql6G/BOqPhR3xBaj6877OQ1pEfYB0S7FAUfrJ468mP2mK+uXvF+Nz3ur qTu/d2G8MrKt1bG3GVcnUvxMpNR12Zm1nigWRnsCzVDQ+gHWbJK3CY+9+0rsG0hdbm aOuFvsBzmOScg== From: Sasha Levin To: patches@lists.linux.dev, stable@vger.kernel.org Cc: Michal Suchanek , Jarkko Sakkinen , Sasha Levin , peterhuewe@gmx.de, jarkko.sakkinen@linux.intel.com, gregkh@linuxfoundation.org, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 17/18] tpm: tis: Double the timeout B to 4s Date: Mon, 19 May 2025 17:22:06 -0400 Message-Id: <20250519212208.1986028-17-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250519212208.1986028-1-sashal@kernel.org> References: <20250519212208.1986028-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.29 Content-Transfer-Encoding: 8bit From: Michal Suchanek [ Upstream commit 2f661f71fda1fc0c42b7746ca5b7da529eb6b5be ] With some Infineon chips the timeouts in tpm_tis_send_data (both B and C) can reach up to about 2250 ms. Timeout C is retried since commit de9e33df7762 ("tpm, tpm_tis: Workaround failed command reception on Infineon devices") Timeout B still needs to be extended. The problem is most commonly encountered with context related operation such as load context/save context. These are issued directly by the kernel, and there is no retry logic for them. When a filesystem is set up to use the TPM for unlocking the boot fails, and restarting the userspace service is ineffective. This is likely because ignoring a load context/save context result puts the real TPM state and the TPM state expected by the kernel out of sync. Chips known to be affected: tpm_tis IFX1522:00: 2.0 TPM (device-id 0x1D, rev-id 54) Description: SLB9672 Firmware Revision: 15.22 tpm_tis MSFT0101:00: 2.0 TPM (device-id 0x1B, rev-id 22) Firmware Revision: 7.83 tpm_tis MSFT0101:00: 2.0 TPM (device-id 0x1A, rev-id 16) Firmware Revision: 5.63 Link: https://lore.kernel.org/linux-integrity/Z5pI07m0Muapyu9w@kitsune.suse.cz/ Signed-off-by: Michal Suchanek Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Sasha Levin --- drivers/char/tpm/tpm_tis_core.h | 2 +- include/linux/tpm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h index 970d02c337c7f..6c3aa480396b6 100644 --- a/drivers/char/tpm/tpm_tis_core.h +++ b/drivers/char/tpm/tpm_tis_core.h @@ -54,7 +54,7 @@ enum tis_int_flags { enum tis_defaults { TIS_MEM_LEN = 0x5000, TIS_SHORT_TIMEOUT = 750, /* ms */ - TIS_LONG_TIMEOUT = 2000, /* 2 sec */ + TIS_LONG_TIMEOUT = 4000, /* 4 secs */ TIS_TIMEOUT_MIN_ATML = 14700, /* usecs */ TIS_TIMEOUT_MAX_ATML = 15000, /* usecs */ }; diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 6c3125300c009..3db0b6a87d454 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -224,7 +224,7 @@ enum tpm2_const { enum tpm2_timeouts { TPM2_TIMEOUT_A = 750, - TPM2_TIMEOUT_B = 2000, + TPM2_TIMEOUT_B = 4000, TPM2_TIMEOUT_C = 200, TPM2_TIMEOUT_D = 30, TPM2_DURATION_SHORT = 20, -- 2.39.5