From patchwork Mon Jun 5 17:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Steffen X-Patchwork-Id: 103421 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2870371vqr; Mon, 5 Jun 2023 11:17:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5eYibXqTVblIlGJrmJ3VMs+PxhJesBpq+BeEI4hVnlpYisPKI2WqXOGnugxi9kmtd1pinv X-Received: by 2002:a05:6a00:1aca:b0:63f:120a:1dc3 with SMTP id f10-20020a056a001aca00b0063f120a1dc3mr647409pfv.0.1685989044518; Mon, 05 Jun 2023 11:17:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685989044; cv=none; d=google.com; s=arc-20160816; b=sQwTDxq4A5e/TpgYqfS2+yR/JLZ5ZX9hzHJcmtDK7Xby2beu8aUWlYZiVyVnjL1oPU MYdu7W+rMdk5EaJlht1evlC01taI6tbK9LdSSVFcr2U7uvlpHWbinFNqIg8fpIvqyt8u 6Y7/0mV8yduDMgnZ6Zgn5VWsVV75T5bQ8c1Ng0iQOfwiQaLkoxB2TBunKz6Xlhj+Saj4 6kjaD7Pi4VLGQPMrb+Gdedu6DywADnmMrdbeECcf9KFz0WPXaebD9ydLJhc79jqfw4jP 567skU9tNKWmvrXPGGSWb9Nb8UUMFCVq5yKPOkgXd1EEPMLN5FzPV7nWBdnYdw2nt8nG CSUg== 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=Vtur6RTX0flroJ/eNGaR78Q7yyUnF0gnVbaZQql8MGs=; b=fni8aw/0/zXDU//MbeTRikpWzk918i5od4U5WUoYO+BnAym15Dvqkg/nl8vrFOWmXX Wgwl4PtPESvfkR37fwClLHXgkQdpbW72wmnepKoX5LYTP0f382/E+v1HaW0E3qxI6m+q vDfCUQoIiwwQJ0MrAJASiYtJ5UZk32DvExyeQSM/gN6UoJFDblEPG0TjyfBO3w77IhzY rqqa5YKl9ct+4DuJByuiK3Jrpw0kj6Ntjkn455nryu+NYj2qySeNBQFWA3h0eGvtccFN S7wa7S+scCsK9TanwwxveAY3yQ8+p1G+MyuaAP/ntbf/cHebUTGzObPcNIzrsS+pQBAW w9WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infineon.com header.s=IFXMAIL header.b=T5j7KHWh; 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 n18-20020aa79852000000b006569793597esi3394879pfq.316.2023.06.05.11.17.10; Mon, 05 Jun 2023 11:17:24 -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=T5j7KHWh; 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 S235464AbjFERxl (ORCPT + 99 others); Mon, 5 Jun 2023 13:53:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235314AbjFERxa (ORCPT ); Mon, 5 Jun 2023 13:53:30 -0400 Received: from smtp2.infineon.com (smtp2.infineon.com [IPv6:2a00:18f0:1e00:4::4]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05A4D10B; Mon, 5 Jun 2023 10:53:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=infineon.com; i=@infineon.com; q=dns/txt; s=IFXMAIL; t=1685987610; x=1717523610; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QhugzGSrT0hfnugDbYqjGfVx3bVGA7aZy3nl5v+JSRM=; b=T5j7KHWhze+ABe1QOOI68YfYkVWKI4XoPaKuXPLZBoVfZhtzLelJYKBl QoJKxiZK56wSUoukftVm6KovpjyyzlYEJeCVv9NfFaBlRazjjRIv0m8Jw 9mvMEIein0omDcqPSzU8WLlMoSkUyeyn5cuAv3otOZTD4pKopMLkFj2Pb Q=; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="40772632" X-IronPort-AV: E=Sophos;i="6.00,218,1681164000"; d="scan'208";a="40772632" Received: from unknown (HELO MUCSE805.infineon.com) ([172.23.29.31]) by smtp2.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 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; Mon, 5 Jun 2023 19:53:24 +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 3/4] tpm_tis: Use responseRetry to recover from data transfer errors Date: Mon, 5 Jun 2023 19:52:49 +0200 Message-ID: <20230605175250.2055-4-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?1767887648081537794?= X-GMAIL-MSGID: =?utf-8?q?1767887648081537794?= TPM responses may become damaged during transmission, for example due to bit flips on the wire. Instead of aborting when detecting such issues, the responseRetry functionality can be used to make the TPM retransmit its response and receive it again without errors. Change-Id: Ifb9fa8bf2106fed6f3dfc9fae935e0bbd30d117f Signed-off-by: Alexander Steffen --- drivers/char/tpm/tpm_tis_core.c | 40 ++++++++++++++++++++++++++------- drivers/char/tpm/tpm_tis_core.h | 1 + 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index 5ddaf24518be..a08768e55803 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -345,11 +345,6 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count) u32 expected; int rc; - if (count < TPM_HEADER_SIZE) { - size = -EIO; - goto out; - } - size = recv_data(chip, buf, TPM_HEADER_SIZE); /* read first 10 bytes, including tag, paramsize, and result */ if (size < TPM_HEADER_SIZE) { @@ -382,7 +377,7 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count) goto out; } status = tpm_tis_status(chip); - if (status & TPM_STS_DATA_AVAIL) { /* retry? */ + if (status & TPM_STS_DATA_AVAIL) { dev_err(&chip->dev, "Error left over data\n"); size = -EIO; goto out; @@ -396,10 +391,39 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count) } out: - tpm_tis_ready(chip); return size; } +static int tpm_tis_recv_with_retries(struct tpm_chip *chip, u8 *buf, size_t count) +{ + struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); + unsigned int try; + int rc = 0; + + if (count < TPM_HEADER_SIZE) { + rc = -EIO; + goto out; + } + + for (try = 0; try < TPM_RETRY; try++) { + rc = tpm_tis_recv(chip, buf, count); + + if (rc == -EIO) { + /* Data transfer errors, indicated by EIO, can be + * recovered by rereading the response. + */ + tpm_tis_write8(priv, TPM_STS(priv->locality), + TPM_STS_RESPONSE_RETRY); + } else { + break; + } + } + +out: + tpm_tis_ready(chip); + return rc; +} + /* * If interrupts are used (signaled by an irq set in the vendor structure) * tpm.c can skip polling for the data to be available as the interrupt is @@ -986,7 +1010,7 @@ static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value) static const struct tpm_class_ops tpm_tis = { .flags = TPM_OPS_AUTO_STARTUP, .status = tpm_tis_status, - .recv = tpm_tis_recv, + .recv = tpm_tis_recv_with_retries, .send = tpm_tis_send, .cancel = tpm_tis_ready, .update_timeouts = tpm_tis_update_timeouts, diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h index e978f457fd4d..8458cd4a84ec 100644 --- a/drivers/char/tpm/tpm_tis_core.h +++ b/drivers/char/tpm/tpm_tis_core.h @@ -34,6 +34,7 @@ enum tis_status { TPM_STS_GO = 0x20, TPM_STS_DATA_AVAIL = 0x10, TPM_STS_DATA_EXPECT = 0x08, + TPM_STS_RESPONSE_RETRY = 0x02, TPM_STS_READ_ZERO = 0x23, /* bits that must be zero on read */ };