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 7E85324110F; Mon, 19 May 2025 21:23:20 +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=1747689800; cv=none; b=bFQWV1zVetjaitlGEPMefwnGTC6Mc+oMzwlAQAPj8h+5kMkFIhUGd6xpEbkaZybXL5QmP2RNjlOvLWSPrWBf16JOfg+HVHCXRMB8YCwGloAHigGqxLdDshDkHg9st12cQRkdDhQCQxHWhaHhTI/CoAUiqx36xovVWeR1JS0ak4Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747689800; c=relaxed/simple; bh=Bk4HScsX6dMMIRV2eHPtcIh3oN/Gp9o6FmcIgx+RUVk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ml4OwkM3GK2eYUan9mRV7SmVe26t1GKGB8aMsLPZezQDNLebVoOkCLzjlx//lrkOcChNL4BTVvHp0RevHNubf1nFf7hdFu37kO3ZMWab8c4dNTxA0tHD2ut7t7w0tqv6FKkiUg8qt4df1h41CtbRNhZPX7SoGIBxaXWcz07a65c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a/VFhxnV; 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="a/VFhxnV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44A80C4CEE4; Mon, 19 May 2025 21:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747689800; bh=Bk4HScsX6dMMIRV2eHPtcIh3oN/Gp9o6FmcIgx+RUVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a/VFhxnVQknzbdXVFga7D8gC5W/EvXUu8HniF8u7tM+RMJx6QPUamgR4QWA4vOsvm ubFUWN4CBLNfxPhxGju9vcxSCqPl5vsc5A302R8edc+LeAssV1QD01PFL/FnRQOZ+H h1FcD/E/v59A41uZdsxFgTBVEkcFf+lvT79oo9qQfct3FGTQwtnMNgTdWsUDDPqIIx JfHnN+WgtAJp7ocqX/L4oFjp/Se5tIbB33yYXafCsaURiFVRapdJuKa6MuZV5j4yNp VETye1A1hTQ6N//oEglJzdnEShjFUXDsCrTw8n/f88sqZ7sIhVlodnzj/x0oIn3moL YN/tYaEcIa/LA== 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 5.15 7/7] tpm: tis: Double the timeout B to 4s Date: Mon, 19 May 2025 17:23:08 -0400 Message-Id: <20250519212308.1986645-7-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250519212308.1986645-1-sashal@kernel.org> References: <20250519212308.1986645-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 5.15.183 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 464ed352ab2e8..ed7b2caa9ebbd 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 12d827734686d..2652de93e97b2 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