From patchwork Mon Jun 5 17:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Steffen X-Patchwork-Id: 103425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2872928vqr; Mon, 5 Jun 2023 11:22:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4f5NtZBuihuKKTf9TmVF8u+8dC+9hdbDcI70o5pucNeOeNHFg6kqFXqclAvnWZOeNpMs/9 X-Received: by 2002:a17:902:f681:b0:1b1:fbb5:baed with SMTP id l1-20020a170902f68100b001b1fbb5baedmr2410486plg.38.1685989324560; Mon, 05 Jun 2023 11:22:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685989324; cv=none; d=google.com; s=arc-20160816; b=CapDo7wymX/z2BsmSjuee6h4xQTZyVL1ylRDBY4g0U7FD7NqmKOO2tm39IvNtpGEtB EMSw/lBlmOH/U2ePLKW+ytVlrckT+yzXxM3RR7URoEO0mx3VFngbuDTOFil8OGXfFzNP igGk/o11X3tx2oNlyVNugyMmHnvaKJMUAAYlHc4RMW+p/FwdH5oKWZtyo93keEgyJ+FV /XSwGDKnEjBUbpX9xUYdk4P1rLJr7TXCHcD0JzGcGoSNhg76V0b46cr0GRtHp/omnrUU 3J6b/UyAWB07VtMMRuhPKjtVgBSk53yPTMamMI2y3YbP8L1Orhz6AnDcSIB1M4lSIC89 BEEA== 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=i6ooLTqpPLl06XKowuhTshueICyYQXgNGH4MTZejt2k=; b=D0C0KZDxj2TO1fOowOUmzNXRDKcPzXmd/cq98Hpoq7zBJrka0g9D3xbf0z4Z5pRDZc hCmzWyewTcXamJUBY0KmqdKXXdDKBwGpDYP6mnZ7aKvqfjqIJFAycggKPVE2jZbIYU25 TmS4gRP2tGp9qnRlgCAyQYk4fh0l++7x2e6+vTCm3bcOHM+RYcNAbGK0h9EVDIy1NwNH QHmIDg5ZrrpGbfF/EBXbgdxppRVmoxDfLjlGmtDRRwSefXnh5At4mYhVAwP9ZooQyuxF 74ho1Snc+2eDqUndvt9cbZrEPGvNj4IXVREOUvyU7TNgjhFVz8TUYQ67sCF5Fckt9eWF MtqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infineon.com header.s=IFXMAIL header.b=IDUj6MFS; 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 w5-20020a1709029a8500b001a920be2722si5655392plp.610.2023.06.05.11.21.51; Mon, 05 Jun 2023 11:22:04 -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=IDUj6MFS; 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 S235475AbjFERxi (ORCPT + 99 others); Mon, 5 Jun 2023 13:53:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231866AbjFERx3 (ORCPT ); Mon, 5 Jun 2023 13:53:29 -0400 Received: from smtp11.infineon.com (smtp11.infineon.com [IPv6:2a00:18f0:1e00:4::5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A500109; Mon, 5 Jun 2023 10:53:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=infineon.com; i=@infineon.com; q=dns/txt; s=IFXMAIL; t=1685987607; x=1717523607; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HwC2Jb0kxHE1+xykN93sfn2LkkNfwVz71nFqYVx0hjc=; b=IDUj6MFS+rV/RwJtp60MY5vu3xEqHXJOxNr62341PwmWWGV9DsVIlloV uf0Mpd3RiP3q88JJHKTwX+jLdsAxntM7j86ERJlj4ujh/zCKy1NbjIkcI 3mFfGE/UxvdS9YmOgWpJ62z+XNtij+rObisrGcnRUxfBEu/LTKEbESrMf I=; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="17446198" X-IronPort-AV: E=Sophos;i="6.00,218,1681164000"; d="scan'208";a="17446198" Received: from unknown (HELO MUCSE803.infineon.com) ([172.23.29.29]) by smtp11.infineon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2023 19:53:25 +0200 Received: from KLUSE818.infineon.com (172.28.156.171) by MUCSE803.infineon.com (172.23.29.29) 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 19:53:25 +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 19:53:24 +0200 From: Alexander Steffen To: , , CC: Alexander Steffen Subject: [PATCH 4/4] tpm_tis: Resend command to recover from data transfer errors Date: Mon, 5 Jun 2023 19:52:50 +0200 Message-ID: <20230605175250.2055-5-Alexander.Steffen@infineon.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20230605175250.2055-1-Alexander.Steffen@infineon.com> References: <20230605175250.2055-1-Alexander.Steffen@infineon.com> MIME-Version: 1.0 X-Originating-IP: [10.161.6.196] X-ClientProxiedBy: MUCSE817.infineon.com (172.23.29.43) 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?1767887941749190288?= X-GMAIL-MSGID: =?utf-8?q?1767887941749190288?= 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. Change-Id: Ifad9cccff94b59242d36fba9c1e92c7a6bb57804 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);