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 8A7F5C433F5 for ; Thu, 14 Apr 2022 12:07:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242720AbiDNMJp (ORCPT ); Thu, 14 Apr 2022 08:09:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234127AbiDNMJo (ORCPT ); Thu, 14 Apr 2022 08:09:44 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49C871DA7A; Thu, 14 Apr 2022 05:07:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0A2DCB82893; Thu, 14 Apr 2022 12:07:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6BBF2C385A5; Thu, 14 Apr 2022 12:07:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649938037; bh=fD5H+AHlNuloFWN8eOvS2D969xXSqjhbt85Vypx3ujg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=e+MdVUz+OFOQpreLTstwipHSAoZgG5U2C89UHMsVtw/8GXzdnzHLO4vAwjT7ImEIF Nv3J6qN0putDd3iOOV6mSRi8UKURRtt/rBOAMvUtx7IT5NAptWFxjMd1FSbOZK1Iip 6YrrFCzonD0Szi67lKV9QnPpnjdeZrVUWWo7kPJxr8no+lYXuzo2SZYJZSPgi0cnq4 hlmUC7dvcCcw3k+MzBOjSCin/BKVxRE/gGNuNxdRiqgY8B28eX3iZkfm2/JWBkeO70 K4ViF82voXJLiMgrv/hR5jsnIkEq8PaTACdJSsgVa/IXoERNGz/d55mEsNb+KDOQJq Dgg2bKb2Zgynw== Date: Thu, 14 Apr 2022 15:06:09 +0300 From: Jarkko Sakkinen To: "Jes B. Klinke" Cc: linux-integrity@vger.kernel.org, Paul Menzel , Jason Gunthorpe , Peter Huewe , linux-kernel@vger.kernel.org Subject: Re: [PATCH] tpm: cr50: Add new device/vendor ID 0x504a6666 Message-ID: References: <20220405173741.4023216-1-jbk@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220405173741.4023216-1-jbk@chromium.org> Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org On Tue, Apr 05, 2022 at 10:37:41AM -0700, Jes B. Klinke wrote: > Accept one additional numerical value of DID:VID for next generation > Google TPM, to be used in future Chromebooks. > > This patch touches more lines than may seem necessary, as a result of > the need to move the error case to sit after the two recognized cases. > > Signed-off-by: Jes B. Klinke > --- > > drivers/char/tpm/tpm_tis_i2c_cr50.c | 21 +++++++++++++-------- > 1 file changed, 13 insertions(+), 8 deletions(-) > > diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c b/drivers/char/tpm/tpm_tis_i2c_cr50.c > index f6c0affbb4567..bf54ebd6724b0 100644 > --- a/drivers/char/tpm/tpm_tis_i2c_cr50.c > +++ b/drivers/char/tpm/tpm_tis_i2c_cr50.c > @@ -31,6 +31,7 @@ > #define TPM_CR50_TIMEOUT_SHORT_MS 2 /* Short timeout during transactions */ > #define TPM_CR50_TIMEOUT_NOIRQ_MS 20 /* Timeout for TPM ready without IRQ */ > #define TPM_CR50_I2C_DID_VID 0x00281ae0L /* Device and vendor ID reg value */ > +#define TPM_TI50_I2C_DID_VID 0x504a6666L /* Device and vendor ID reg value */ > #define TPM_CR50_I2C_MAX_RETRIES 3 /* Max retries due to I2C errors */ > #define TPM_CR50_I2C_RETRY_DELAY_LO 55 /* Min usecs between retries on I2C */ > #define TPM_CR50_I2C_RETRY_DELAY_HI 65 /* Max usecs between retries on I2C */ > @@ -742,16 +743,20 @@ static int tpm_cr50_i2c_probe(struct i2c_client *client) > } > > vendor = le32_to_cpup((__le32 *)buf); > - if (vendor != TPM_CR50_I2C_DID_VID) { > - dev_err(dev, "Vendor ID did not match! ID was %08x\n", vendor); > - tpm_cr50_release_locality(chip, true); > - return -ENODEV; > + if (vendor == TPM_CR50_I2C_DID_VID) { > + dev_info(dev, "cr50 TPM 2.0 (i2c 0x%02x irq %d id 0x%x)\n", > + client->addr, client->irq, vendor >> 16); > + return tpm_chip_register(chip); > + } > + if (vendor == TPM_TI50_I2C_DID_VID) { > + dev_info(dev, "ti50 TPM 2.0 (i2c 0x%02x irq %d id 0x%x)\n", > + client->addr, client->irq, vendor >> 16); > + return tpm_chip_register(chip); > } > > - dev_info(dev, "cr50 TPM 2.0 (i2c 0x%02x irq %d id 0x%x)\n", > - client->addr, client->irq, vendor >> 16); > - > - return tpm_chip_register(chip); > + dev_err(dev, "Vendor ID did not match! ID was %08x\n", vendor); > + tpm_cr50_release_locality(chip, true); > + return -ENODEV; > } > > /** > -- > 2.35.1.1094.g7c7d902a7c-goog > Reviewed-by: Jarkko Sakkinen BR, Jarkko