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 A081CEEB562 for ; Fri, 8 Sep 2023 18:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242137AbjIHSZE (ORCPT ); Fri, 8 Sep 2023 14:25:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343625AbjIHSXo (ORCPT ); Fri, 8 Sep 2023 14:23:44 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CED992D7B; Fri, 8 Sep 2023 11:21:26 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 301E8C116A2; Fri, 8 Sep 2023 18:20:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694197258; bh=P5hnyUObGqR96a01yY7SLm9LACRfzlpZt1T4nXOnP9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z4yav1TBdV6q2X+5GYaUiRo0GE8ga99PpDSirsdTAHEAR+m0Wd6z0Jr3fwoKiB7MH ZHbC7/ZATDqcqoxXqPjogim2SLR3whfjByTtPYZIWvFsl1R3ed0rdUiohw4WnOVo9m zIaDEKpzSwl1aB8jcQO6YEX79rqZ/1r70Ern2p2Qir6hek3759wceyPnO8X1WeUhnw pVJa1XnoJSsoAFBGdV1tSxofZ9hbhlezBgIDYl6vO3Xq9nPWvtwxNtW2pqc7Dr+7n2 aSLe28QPrMl+hPDriU7kceVekl28GQ4D0/vgzG9jDaSskWCN9i1BmQ2mZdT9AjKEaB IQK/hJttU1fZA== 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.4 05/10] tpm_tis: Resend command to recover from data transfer errors Date: Fri, 8 Sep 2023 14:20:39 -0400 Message-Id: <20230908182046.3460968-5-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908182046.3460968-1-sashal@kernel.org> References: <20230908182046.3460968-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.256 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 ef47d1d58ac3a..a084f732c1804 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -421,10 +421,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