From patchwork Wed Apr 2 17:21:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Suchanek X-Patchwork-Id: 14036259 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61EEC19885F for ; Wed, 2 Apr 2025 17:21:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743614505; cv=none; b=T9uSpNVOS2eTGmNfdUDeHE5cGJatVha0A2vcp7i1FSQRr9xsDUqaJuVA8r304H+Wm+O0VRDuGQHAlLsHz2S0yaSXcb/EfewXshJHDa6Ql5kOcG0888LautgLBzBdYC/eeddrBgE2kAqKIkO9jDUzbfN23AQqhqPbwQ97zEXlWhk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743614505; c=relaxed/simple; bh=pPvUVx8w3534AH26P8xfZUy/BS8igRvD669kpXh/0jg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ckos73XuTxl/e8GytSluJj0SlakLPmn+SdpXthikUSMR0CBd4Q/dzNQFlOWw2LwccBKLtUmIBHB6BjhCLZD9tvTK9PVc77yST0i5V6dzELdYiQOW3MTui9bfFzBgdYZKMP5nd/H0cQw2KWDYqV+Td+f7WiF4rvlGZDVqdVQMp+k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=xet3QQAy; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=SZ3HdaK3; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=xet3QQAy; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=SZ3HdaK3; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="xet3QQAy"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="SZ3HdaK3"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="xet3QQAy"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="SZ3HdaK3" Received: from kitsune.suse.cz (unknown [10.100.12.127]) by smtp-out2.suse.de (Postfix) with ESMTP id 80AB01F38A; Wed, 2 Apr 2025 17:21:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1743614501; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CbZNo4dyJrIgS4/ORAw10xdILQG863hlxScew89HxRw=; b=xet3QQAyx1rzfh7DGyedYEnaCWfJ/Gcu8tG4pb2NAvFBDB2/+IShFmzk5f00SW/E/QM4bw segYhmoFKFXX6mcRYlgfgii09ruwJuU7+QcNNJGFTb/4w1ac+wmHRaoX1Tt5gkTKgUfhv6 iddb6yYzx7PjeB8V+phzFEHOTgQSdXg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1743614501; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CbZNo4dyJrIgS4/ORAw10xdILQG863hlxScew89HxRw=; b=SZ3HdaK3U5eYBciFrzbZ79TaFBGRFlnlbGCrrtnIv/KZp3owjEWB8fjN3xe3EddztK+gmH qWK84B5sLU5pO+AA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1743614501; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CbZNo4dyJrIgS4/ORAw10xdILQG863hlxScew89HxRw=; b=xet3QQAyx1rzfh7DGyedYEnaCWfJ/Gcu8tG4pb2NAvFBDB2/+IShFmzk5f00SW/E/QM4bw segYhmoFKFXX6mcRYlgfgii09ruwJuU7+QcNNJGFTb/4w1ac+wmHRaoX1Tt5gkTKgUfhv6 iddb6yYzx7PjeB8V+phzFEHOTgQSdXg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1743614501; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CbZNo4dyJrIgS4/ORAw10xdILQG863hlxScew89HxRw=; b=SZ3HdaK3U5eYBciFrzbZ79TaFBGRFlnlbGCrrtnIv/KZp3owjEWB8fjN3xe3EddztK+gmH qWK84B5sLU5pO+AA== From: Michal Suchanek To: Cc: Michal Suchanek , Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan McDowell Subject: [PATCH] tpm: tis: Increase the default for timeouts B and C Date: Wed, 2 Apr 2025 19:21:30 +0200 Message-ID: <20250402172134.7751-1-msuchanek@suse.de> X-Mailer: git-send-email 2.47.1 Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.997]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_SEVEN(0.00)[7]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[suse.de,gmx.de,kernel.org,ziepe.ca,vger.kernel.org,earth.li]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Spam-Score: -2.80 X-Spam-Flag: NO With some Infineon chips the timeouts in tpm_tis_send_data (both B and C) can reach up to about 2250 ms. Extend the timeout duration to accommodate this. Link: https://lore.kernel.org/linux-integrity/Z5pI07m0Muapyu9w@kitsune.suse.cz/ Signed-off-by: Michal Suchanek --- An alternative would be to add an entry to vendor_timeout_overrides but I do not know how to determine the chip IDs to put into this table. --- drivers/char/tpm/tpm_tis_core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h index 970d02c337c7..1ff565be2175 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, /* 2 sec */ TIS_TIMEOUT_MIN_ATML = 14700, /* usecs */ TIS_TIMEOUT_MAX_ATML = 15000, /* usecs */ }; @@ -64,7 +64,7 @@ enum tis_defaults { */ #define TIS_TIMEOUT_A_MAX max_t(int, TIS_SHORT_TIMEOUT, TPM2_TIMEOUT_A) #define TIS_TIMEOUT_B_MAX max_t(int, TIS_LONG_TIMEOUT, TPM2_TIMEOUT_B) -#define TIS_TIMEOUT_C_MAX max_t(int, TIS_SHORT_TIMEOUT, TPM2_TIMEOUT_C) +#define TIS_TIMEOUT_C_MAX max_t(int, TIS_LONG_TIMEOUT, TPM2_TIMEOUT_C) #define TIS_TIMEOUT_D_MAX max_t(int, TIS_SHORT_TIMEOUT, TPM2_TIMEOUT_D) #define TPM_ACCESS(l) (0x0000 | ((l) << 12))