From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9979EEB568 for ; Fri, 8 Sep 2023 18:31:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231629AbjIHSbH (ORCPT ); Fri, 8 Sep 2023 14:31:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229654AbjIHSbG (ORCPT ); Fri, 8 Sep 2023 14:31:06 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BA2A4691; Fri, 8 Sep 2023 11:20:45 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36717C43395; Fri, 8 Sep 2023 18:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694197184; bh=gTvBjhblGfOCGq6YxqIkoHtJHRP7ZzQuH4eEA0DNYk8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fhI/3ZOiNcc3ezNm63kTUSwMXcMSycs7C92jB2QVfLsNxzPYbK1xY8KgZRmOK15yJ dEteKHXbaQ8eyH8QyjoOxIHeWayJf5RMIh91bpxIzcG9mJXFFxa+5fAnpWqSkRomFj fgb/VqcG1Wf82XruiNnkjG853KpoBKoe2l068+i5g3+DdXoTPbshrWAmW0n7Mn8TOt VBmx0YDWfUpNuAXzx1UedZpaSsdRw6fseMxj1xQHF0f7WsTIGSrKw6jYswdQT35yjh ZBeOot5BWaxE5cGjCgr9u6i9ix+xqAcXi5WBqbv/7HWbOLyTgSSBh/SBAcEUXWuW7J C1hRTpr8IbyVw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexander Steffen , Jarkko Sakkinen , Sasha Levin , peterhuewe@gmx.de, linux-integrity@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 08/15] tpm_tis: Resend command to recover from data transfer errors Date: Fri, 8 Sep 2023 14:19:11 -0400 Message-Id: <20230908181920.3460520-8-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908181920.3460520-1-sashal@kernel.org> References: <20230908181920.3460520-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.131 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander Steffen [ Upstream commit 280db21e153d8810ce3b93640c63ae922bcb9e8e ] Similar to the transmission of TPM responses, also the transmission of TPM commands may become corrupted. Instead of aborting when detecting such issues, try resending the command again. Signed-off-by: Alexander Steffen Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Sasha Levin --- drivers/char/tpm/tpm_tis_core.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index d7c440ac465f3..b3452259d6e0b 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -469,10 +469,17 @@ static int tpm_tis_send_main(struct tpm_chip *chip, const u8 *buf, size_t len) int rc; u32 ordinal; unsigned long dur; - - rc = tpm_tis_send_data(chip, buf, len); - if (rc < 0) - return rc; + unsigned int try; + + for (try = 0; try < TPM_RETRY; try++) { + rc = tpm_tis_send_data(chip, buf, len); + if (rc >= 0) + /* Data transfer done successfully */ + break; + else if (rc != -EIO) + /* Data transfer failed, not recoverable */ + return rc; + } /* go and do it */ rc = tpm_tis_write8(priv, TPM_STS(priv->locality), TPM_STS_GO); -- 2.40.1