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 A62F323AE62; Mon, 19 May 2025 21:23:07 +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=1747689787; cv=none; b=Ta7VdcZgogalhyrzqA9lgA5KLAny7aH5BAN36+WYZ/4yxaHSrhAqLhgBzVCbJzwoiE8sv5oN07eS7QT2J7CQvksUJNxK6CDW8PrCmn9H7PDegM4koXDzXZKkHwT8nBEj+rAgMOC6uBxfmV1BBtiGEsN29YIv3iaeVq2ueVs7tdc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747689787; c=relaxed/simple; bh=984fx6PrU31NH9mXRUVFLTIgsRux/L79dAgCuodERek=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZaTYeUhh31uQCD6i2OSayCTZ/PnEuGJVn2bimjTVVNZ8uu3g94xjM/IjHPDfX2K6m362a7D4PBJibDgm8tBX1iLQAGO+A5qYyxfkeu9WNL/IwmLUxyUritgD0mougYYX74PLf42AH4YBDCk+oIjFoPys/s6OPCbx3m98mBF329Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rIZzsPfb; 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="rIZzsPfb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DF37C4CEED; Mon, 19 May 2025 21:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747689787; bh=984fx6PrU31NH9mXRUVFLTIgsRux/L79dAgCuodERek=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rIZzsPfb1upxxkNlDY1oe49sXPD+PQqXojgNaSdFWhbGjTZ75cZAmNLlHck8ILgC8 la0PqwAy4zX//v0Xj0Cn+9cioYYfoCPD54tQedkeD+Tp7n8h1ffmX4nD6MY2HG5uP8 FcVkTJShzpwKfkrsoI7hHn1HLL5G5ChBRS1nRjhwyw2rvVTPY5sjrFS3Iom04STJvw /2spLhq9zXUkTAnjG4Elr68zTbyhLFt5zruHo46QFljVIkT85oI4lqkJt5uZwFDHsm z/urGorXJRRU42QN7igLPeGvEXPAUjcXmGHez9QIzKk97xkEh2SjO36keRYN+Mf/jT PP0TRNLAl14lw== 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.1 7/8] tpm: tis: Double the timeout B to 4s Date: Mon, 19 May 2025 17:22:54 -0400 Message-Id: <20250519212255.1986527-7-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250519212255.1986527-1-sashal@kernel.org> References: <20250519212255.1986527-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.1.139 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 be72681ab8ea2..5f29eebef52b8 100644 --- a/drivers/char/tpm/tpm_tis_core.h +++ b/drivers/char/tpm/tpm_tis_core.h @@ -53,7 +53,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 dd0784a6e07d9..4a4112bb1d1b8 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -181,7 +181,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