From patchwork Tue Jun 13 18:02: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: 107508 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp752911vqr; Tue, 13 Jun 2023 11:39:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4qNebnZNybZH2eL7rqccQKmQE7cdzZXxCQqi6gOvKo0KnuHNWCXOdQJktZcLfweS+7rrte X-Received: by 2002:a05:6a20:e18b:b0:110:2d7f:8eb9 with SMTP id ks11-20020a056a20e18b00b001102d7f8eb9mr11053794pzb.40.1686681551794; Tue, 13 Jun 2023 11:39:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686681551; cv=none; d=google.com; s=arc-20160816; b=mfxIIV2GB0ODuRBIweFf2zmn758vx8QFOQXcVTJPmcavngC9/cncWjoew6uKc/GiP8 BQIGNeOiC3EdGxS1eGhlike6HJk/fMvmu4P8VuyaQ82iS5XREXnbBdUz2Hp9E+TKDle1 USLf2OAh7gC+3ITpGabnMPeJKeLJ5aHjGWMHcfA2hVogXfpE2hpVkja7nysLmSp2tF0K NdTe4Y7nWG6wVsnyJllNVYrLiNCYH1WgtiQmkklCVTj0WF8+Se+rw+UiTJ0cbJnDfzAV z2v6S2ypOihLkvxXNDLLa3RVXeo+3EuhP19N8LS3ed0SQuLMNDd0jhiKvbr7o3il/ta7 nptQ== 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=cZuzk646xfwwM6zL0A29RiSgoLgKkAamheB+Pt3s1Tg=; b=ze7EapKTAkvdsM6twW8ixAR39bR6zll/o1p6k+iOVWY5ZfFlfOHbW2fs9zV4XXtw+S 7BBKXb5NY2t5X15nQfMeI3ihJ1OzCFb8B3le/k2AMVw0k6dFWvfcbEszaC+0Wxm/KfQ4 k1SwgsE/jcZ2h5ftmMVrMvKxazPYBeZA5IaJhEQWj0WUCtRVWIzoM0FEOY0udzXf6Mav JYbdCzTLWIxGYdyB2weqEsYFvb32HwPXQVdFqO4XYB7S6h/Z8OuHkj3Zhn2PSsvqbI/9 y7jpn6Q7dAoHp6EzOyuY1D7MGWHy/tM8/5OStQtr0pui6DAW0tEcWSwNqqCfYY+6ZtUt uqLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infineon.com header.s=IFXMAIL header.b=a4syogty; 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 k11-20020a637b4b000000b00543f6a35a43si6132274pgn.306.2023.06.13.11.38.55; Tue, 13 Jun 2023 11:39:11 -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=a4syogty; 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 S239426AbjFMSD0 (ORCPT + 99 others); Tue, 13 Jun 2023 14:03:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240119AbjFMSDU (ORCPT ); Tue, 13 Jun 2023 14:03:20 -0400 Received: from smtp2.infineon.com (smtp2.infineon.com [IPv6:2a00:18f0:1e00:4::4]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3945810F7; Tue, 13 Jun 2023 11:03:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=infineon.com; i=@infineon.com; q=dns/txt; s=IFXMAIL; t=1686679399; x=1718215399; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6JLgbkkYt1U63xIpmUAgRDi0lykGOmT7an3pZEBkGhI=; b=a4syogtyV87Ts+C5WVfVPecZkk6xHPOfdnNeFbm4IXkxR8M5TR00gvhy FjWby6K6R5L0kiT++aQYVuvfu4IMlHG+qT7IkWq3a/GA1MCAvEzRRjge1 NzlWxwyoq5DL0/8uJEI1wGPMCWbpO5EUMTPF+CddEQU8uRHZPzs3+CZ8W E=; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="41820531" X-IronPort-AV: E=Sophos;i="6.00,240,1681164000"; d="scan'208";a="41820531" Received: from unknown (HELO MUCSE805.infineon.com) ([172.23.29.31]) by smtp2.infineon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 20:03:17 +0200 Received: from KLUSE818.infineon.com (172.28.156.171) by MUCSE805.infineon.com (172.23.29.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Tue, 13 Jun 2023 20:03:17 +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; Tue, 13 Jun 2023 20:03:16 +0200 From: Alexander Steffen To: , , CC: Alexander Steffen Subject: [PATCH v3 4/4] tpm_tis: Resend command to recover from data transfer errors Date: Tue, 13 Jun 2023 20:02:59 +0200 Message-ID: <20230613180259.3525-5-Alexander.Steffen@infineon.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20230613180259.3525-1-Alexander.Steffen@infineon.com> References: <20230613180259.3525-1-Alexander.Steffen@infineon.com> MIME-Version: 1.0 X-Originating-IP: [10.161.6.196] X-ClientProxiedBy: MUCSE821.infineon.com (172.23.29.47) 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,URIBL_BLOCKED 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?1768613794682986311?= X-GMAIL-MSGID: =?utf-8?q?1768613794682986311?= 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 --- drivers/char/tpm/tpm_tis_core.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index a6d1396413a7..7b13ad4bd6dd 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -532,10 +532,17 @@ 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);