Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Message-ID: <c8f5ada2-c5cc-fe1b-bdeb-8b7d134250ee@molgen.mpg.de>
Date:   Wed, 20 Apr 2022 12:52:23 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.8.0
Subject: Re: [PATCH v2] tpm: cr50: Add new device/vendor ID 0x504a6666
Content-Language: en-US
To:     "Jes B. Klinke" <jbk@chromium.org>
Cc:     linux-integrity@vger.kernel.org,
        Jarkko Sakkinen <jarkko@kernel.org>,
        Jason Gunthorpe <jgg@ziepe.ca>,
        Peter Huewe <peterhuewe@gmx.de>, linux-kernel@vger.kernel.org
References: <20220419163749.1.Ica39bd8d1494f750a70a668e5929f6e5e63241f2@changeid>
From:   Paul Menzel <pmenzel@molgen.mpg.de>
In-Reply-To: <20220419163749.1.Ica39bd8d1494f750a70a668e5929f6e5e63241f2@changeid>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

Dear Jes,


Am 20.04.22 um 01:37 schrieb Jes B. Klinke:
> Accept one additional numerical value of DID:VID for next generation
> Google TPM with new firmware, to be used in future Chromebooks.
> 
> The TPM with the new firmware has the code name TI50, and is going to
> use the same interfaces.
> 
> Signed-off-by: Jes B. Klinke <jbk@chromium.org>
> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
> ---
> 
>   drivers/char/tpm/tpm_tis_i2c_cr50.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> index f6c0affbb4567..4ddb8ff3a8569 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,15 +743,15 @@ static int tpm_cr50_i2c_probe(struct i2c_client *client)
>   	}
>   
>   	vendor = le32_to_cpup((__le32 *)buf);
> -	if (vendor != TPM_CR50_I2C_DID_VID) {
> +	if (vendor != TPM_CR50_I2C_DID_VID && vendor != TPM_TI50_I2C_DID_VID) {
>   		dev_err(dev, "Vendor ID did not match! ID was %08x\n", vendor);
>   		tpm_cr50_release_locality(chip, true);
>   		return -ENODEV;
>   	}
>   
> -	dev_info(dev, "cr50 TPM 2.0 (i2c 0x%02x irq %d id 0x%x)\n",
> +	dev_info(dev, "%s TPM 2.0 (i2c 0x%02x irq %d id 0x%x)\n",
> +		 vendor == TPM_TI50_I2C_DID_VID ? "ti50" : "cr50",
>   		 client->addr, client->irq, vendor >> 16);
> -

Remove this blank line wasn’t needed, I gues.

>   	return tpm_chip_register(chip);
>   }
>   

Thank for addressing the other comments, and congratulations on getting 
your first commit into the Linux kernel.


Kind regards,

Paul