From patchwork Mon Jun 5 17:59:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Steffen X-Patchwork-Id: 103435 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2878312vqr; Mon, 5 Jun 2023 11:32:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ggVdrNStOaAII5T1wdPL0v37JVwu4VjSW8+8NV2Cln9LWHuNuvjlcSQuKPBsPaBYUBHuy X-Received: by 2002:a05:6a20:115:b0:111:c8a6:88ca with SMTP id 21-20020a056a20011500b00111c8a688camr3468637pzr.58.1685989952743; Mon, 05 Jun 2023 11:32:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685989952; cv=none; d=google.com; s=arc-20160816; b=ES5uIAr+9fIw++VwunHRbFasrzTqFdAW3RffB91o1hWdvmLBWXqDp4BKODDrUGMEJt 68rZaS1c3B9QGJY6VEq1l1ARsgYOMiRiqlT3CmetfMAjVKCRt1TTsAGVGrCBYFxtb2N1 +ZEONzYs5TjcWO7LKuteetmoWyAA2TElNqL+5S5sqD3TxVEAAlqZbjGKK8g38EaWz0lG R023Jyt/Y6hHZdC+u6Q30gJhvO/bk8wl47oGS7rjAlct8W7T6Xw8gGjtQsDjIx0GnHaq 5B064FG7xUMClzkTOqEK08fI7yffnpv9uWayb0wS6S/S6pJJdo0GGVms8s1rANnC0D71 f5mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Y48qn1exMGtuPXIINonrkdSm1vvkhA4TAan01YmNdSI=; b=FF8iAywrX19TJ6wJhFugs6aBB7t6FcHXxJbCqiDD5Y6yG03NUzejH2CGQ1XzoGsWiO 9/A5LI9VHgtKyuqNa63E5u66yvbN/3M2DjzPXsCaJgzi3ADO+njglssi/zUV7fGaBMlu H6INFHH2VNFieYD3WGw32CeK8Rb3Mxr3VNGVaae3azVnEv3l23fz4/EWQa7tUYaNqo4F TI+DEE1+qMHVJrf5vBNfbPEbrnjDLBhpgkQa3vLf5zrsx3c5gB+LtUOdAd+lE2BpSR0n B+VYjtiWLZI0dXfu/Bq7w5rjD5fIehs3a3QquHIfm3AKt2VnuB6yF4UsgQg3lW/o4lv0 es8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infineon.com header.s=IFXMAIL header.b=nMXCo8CX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=infineon.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k13-20020a636f0d000000b0054033bf35easi5895411pgc.269.2023.06.05.11.32.20; Mon, 05 Jun 2023 11:32:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@infineon.com header.s=IFXMAIL header.b=nMXCo8CX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=infineon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234370AbjFESAZ (ORCPT + 99 others); Mon, 5 Jun 2023 14:00:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231319AbjFESAN (ORCPT ); Mon, 5 Jun 2023 14:00:13 -0400 Received: from smtp14.infineon.com (smtp14.infineon.com [IPv6:2a00:18f0:1e00:4::6]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC423F9; Mon, 5 Jun 2023 11:00:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=infineon.com; i=@infineon.com; q=dns/txt; s=IFXMAIL; t=1685988012; x=1717524012; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xcXJAmG61qBDUJlBGCtCv2jhORoDcv/wLfQldALvPrI=; b=nMXCo8CXy5I5EEaDpABG2A/Tw4t09po6IunzbAQrO+9jGwe5DVIPmHCP LlYHDPZ7K50ojyVKyCF5YCQyejLSTjUjKwhIaH7N5FlOVT5CfOFul9y1Y yaRMdD5Z7iTmBgzQ2CuQtZR5fgcw5TSBk+4w05eQe2P+HvYrE7MTTnq1L A=; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="15904206" X-IronPort-AV: E=Sophos;i="6.00,218,1681164000"; d="scan'208";a="15904206" Received: from unknown (HELO MUCSE814.infineon.com) ([172.23.29.40]) by smtp14.infineon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2023 20:00:10 +0200 Received: from KLUSE818.infineon.com (172.28.156.171) by MUCSE814.infineon.com (172.23.29.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Mon, 5 Jun 2023 20:00:09 +0200 Received: from ISCNPC0VBFBX.infineon.com (10.161.6.196) by KLUSE818.infineon.com (172.28.156.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Mon, 5 Jun 2023 20:00:09 +0200 From: Alexander Steffen To: , , CC: Alexander Steffen Subject: [PATCH v2 4/4] tpm_tis: Resend command to recover from data transfer errors Date: Mon, 5 Jun 2023 19:59:59 +0200 Message-ID: <20230605175959.2131-5-Alexander.Steffen@infineon.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20230605175959.2131-1-Alexander.Steffen@infineon.com> References: <20230605175959.2131-1-Alexander.Steffen@infineon.com> MIME-Version: 1.0 X-Originating-IP: [10.161.6.196] X-ClientProxiedBy: MUCSE804.infineon.com (172.23.29.30) To KLUSE818.infineon.com (172.28.156.171) X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767888600888733029?= X-GMAIL-MSGID: =?utf-8?q?1767888600888733029?= 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 --- drivers/char/tpm/tpm_tis_core.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index a08768e55803..47073cc79b51 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -535,10 +535,18 @@ static int tpm_tis_send_main(struct tpm_chip *chip, const u8 *buf, size_t len) int rc; u32 ordinal; unsigned long dur; + unsigned int try; - rc = tpm_tis_send_data(chip, buf, len); - if (rc < 0) - return rc; + 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);