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 0E9F7EEB566 for ; Fri, 8 Sep 2023 18:22:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241264AbjIHSW0 (ORCPT ); Fri, 8 Sep 2023 14:22:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235922AbjIHSVR (ORCPT ); Fri, 8 Sep 2023 14:21:17 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C7C430C3; Fri, 8 Sep 2023 11:19:19 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A40FC116B1; Fri, 8 Sep 2023 18:18:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694197136; bh=x07t9AquVDDZ8wPm1iLFiM9WCtFjjsw/1WSYNoDNons=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P+e7ZZ1i33VdeGOFJdxK9YiNpQ6Ft8gSqOdWEEai5tMjx3NsdYDiZ/BcRsTbEdwld uEpJgOsrmCI8x2mja+Ee0UrHkzo3ueknZN0iYr6akAuy8Oa41ZqNxJ4yZ36wauXAlc d7sw/yIsFvXiOxO9zNDspccXYMi1qKNrJoc7toTRc9b7zJO9LaWkRTWROeUPLKpLdu yJBYWLWcVKdm0igk955urb5fkUO0aDgFGl+cn0kxG1y5vV2KZl8ZHR1XPapKr5dh+K dJn0EUqLfQ0/L4XIZ9U34wBrwKH7+GflbFZpx8Asb30HdPyiIc3ePQlWHTSOiRC6vK PtFJSEmoUxStg== 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 6.1 16/26] tpm_tis: Resend command to recover from data transfer errors Date: Fri, 8 Sep 2023 14:17:54 -0400 Message-Id: <20230908181806.3460164-16-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908181806.3460164-1-sashal@kernel.org> References: <20230908181806.3460164-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.52 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 | 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 44f71f2c8cfa0..5889d9edaf940 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -498,10 +498,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; + } rc = tpm_tis_verify_crc(priv, len, buf); if (rc < 0) { -- 2.40.1