On Tue, 2022-04-19 at 16:37 -0700, Jes B. Klinke wrote:
> 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@xxxxxxxxxxxx>
> Reviewed-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
> ---
>
> 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);
> -
> return tpm_chip_register(chip);
> }
>
Thank you, I just picked this.
BR, Jarkko
