From patchwork Tue Mar 14 19:54:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Hasemeyer X-Patchwork-Id: 69825 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1955181wrd; Tue, 14 Mar 2023 12:56:16 -0700 (PDT) X-Google-Smtp-Source: AK7set+oc+J34dNuWW8W/BvadwgXCS9oB4fdwc/cMWd5i8l/wM+euDiyOkJXeBt8bE8RNwUo4ckR X-Received: by 2002:a05:6a20:6a0c:b0:d4:a607:e343 with SMTP id p12-20020a056a206a0c00b000d4a607e343mr6539499pzk.24.1678823776635; Tue, 14 Mar 2023 12:56:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678823776; cv=none; d=google.com; s=arc-20160816; b=FO3WyuoCqtaiGiNKA33cDaJ8lj5NCLx7gJNPfd/00OI1kATur/VXnEka3505dmMOhi 26BTMIe0yVk+D7BL2uFSpUu42hbVHFgzjLPZE0SN3hOXZTat5/lXUyxwypJVduEC+6Vo +DkSavv0i5YKquDIWhxcsS+cEy/SaIjKTZh8FtQkxDWOHMHm54jvYzlVITP+J5Cn1fjL Nmn7AtzhM9DUi5hAuztyZnUmQroapL8s7EU1LMVqYWJcik6FhN5tOpTp86xA89v8dzFG NjZOOHraRaJI7d7C82rGXlkUoqE4EqZpdc4sipwBl5ZXn9Nukv645bKEtazEvnyQqj/F oWwg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=0ILXYxmnfOLR0ewM60G3euG3ql1j35ZPmWRlhkZCiP0=; b=K7wMUbgzeIlFF+BpG/psipDih/cBAlE8TkLyCBV0jfGi6P3sq4ICYkN3XG32ztMFmJ wE45O9gNjlULKAXb8TCZoCabYV0YpgM1X38QXewNYuvWd/MMEGOqLCTwv12/kSGFqZeD s93ybOnqZC4OKKdvkUllBU4IiDmha8hkiL0E3SVXpV4dnUqj350pAjlPLR0J/EVPhknp gsgRmxYUW4XLYPTuXSOFFnyD/OlbOW3kq5UnWIyw5zDMN5HKqPfCEftxYl6eaPzU5grz vGBCHY9JRtQtTD1zTzyHK8G0NGaIyEi5sIzy6lTdKobyN6DafXT2s/HwEyMXd4Ql1jDL U5Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=b7+Z0obj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y7-20020a63de47000000b0050126b5d089si2984087pgi.386.2023.03.14.12.56.02; Tue, 14 Mar 2023 12:56:16 -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=pass header.i=@chromium.org header.s=google header.b=b7+Z0obj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230135AbjCNTye (ORCPT + 99 others); Tue, 14 Mar 2023 15:54:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229722AbjCNTyc (ORCPT ); Tue, 14 Mar 2023 15:54:32 -0400 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4264925949 for ; Tue, 14 Mar 2023 12:54:11 -0700 (PDT) Received: by mail-il1-x132.google.com with SMTP id s7so1621638ilv.12 for ; Tue, 14 Mar 2023 12:54:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678823650; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0ILXYxmnfOLR0ewM60G3euG3ql1j35ZPmWRlhkZCiP0=; b=b7+Z0objvds1+g+MvHWg73uKyRsDn7xQDsrO8N7y5nen+snWZz62/2DCKr+C0ayHlh P3qPei6OCXlzaWbzFO+MrlrP/pQ9gFRP0CCvwwwQyKWxfIavYHkST9viDLG/6R/bne43 fBeyImX0Oa/I3zIUX1G3VttadI8Kjje6aXMZc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678823650; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0ILXYxmnfOLR0ewM60G3euG3ql1j35ZPmWRlhkZCiP0=; b=vFyLSHpe3Qs6gUcj6Vl5paW6ZX2hmihf/mNn5FcduZaC08yhTgxL214er0rVDSalDp s8yhhDyShrkPAIejKy1kyKDNBujCz94CCmuAH7rouDZhURBS8bMNDDJLcPPSaNPYqhPY lpjG1LtLeTnL4PLcXrAU2PUU6CkfV+U5dU/RgjOiC3p52aDZb2D1FVfl6L8euTgyqDwU ftUdTqAA7IzkRTrPyiXrLSR1VYEAF2btkdktwsoISd+U0ymvYa1G0CyeQilZOXvgCybp NrXYimeq6TCL1MAe2T1HpXY002XVboYGv2k8+jtxfE1TyOj54r9cbpnS9iC0eMGM7ARo mjPw== X-Gm-Message-State: AO0yUKVcNsU61drmP42h4jduF3aJ46zrsT5C3HB9JxXnaPHStb9pjGEH +U90vnT+RePVlXXCFCr7kNOwKQ== X-Received: by 2002:a05:6e02:1c01:b0:323:ad6:5357 with SMTP id l1-20020a056e021c0100b003230ad65357mr3511492ilh.28.1678823650533; Tue, 14 Mar 2023 12:54:10 -0700 (PDT) Received: from markhas1.corp.google.com ([2620:15c:183:204:da4a:3c9d:f298:5d61]) by smtp.gmail.com with ESMTPSA id w2-20020a029682000000b00403b917f3a8sm1012718jai.56.2023.03.14.12.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 12:54:10 -0700 (PDT) From: Mark Hasemeyer To: Jarkko Sakkinen Cc: Mark Hasemeyer , Jason Gunthorpe , Peter Huewe , linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] tpm: cr50: i2c: use jiffies to wait for tpm ready irq Date: Tue, 14 Mar 2023 13:54:04 -0600 Message-Id: <20230314135400.1.I5561dfbc4438418281626e43e345e8acc879cd7c@changeid> X-Mailer: git-send-email 2.40.0.rc2.332.ga46443480c-goog MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,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?1760374320363928819?= X-GMAIL-MSGID: =?utf-8?q?1760374320363928819?= When waiting for a tpm ready completion, the cr50 i2c driver incorrectly assumes that the value of timeout_a is represented in milliseconds instead of jiffies. Remove the msecs_to_jiffies conversion. Signed-off-by: Mark Hasemeyer Reviewed-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_tis_i2c_cr50.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c b/drivers/char/tpm/tpm_tis_i2c_cr50.c index 77cea5b31c6e4..376ae18a04ebb 100644 --- a/drivers/char/tpm/tpm_tis_i2c_cr50.c +++ b/drivers/char/tpm/tpm_tis_i2c_cr50.c @@ -100,8 +100,7 @@ static int tpm_cr50_i2c_wait_tpm_ready(struct tpm_chip *chip) } /* Wait for interrupt to indicate TPM is ready to respond */ - if (!wait_for_completion_timeout(&priv->tpm_ready, - msecs_to_jiffies(chip->timeout_a))) { + if (!wait_for_completion_timeout(&priv->tpm_ready, chip->timeout_a)) { dev_warn(&chip->dev, "Timeout waiting for TPM ready\n"); return -ETIMEDOUT; }