[PATCH] drivers/char/tpm: Google TPM, additional DID:VID

[PATCH] drivers/char/tpm: Google TPM, additional DID:VID

[Jes Klinke]

Accept one additional numerical value of DID:VID for Google TPM.

Signed-off-by: Jes B. Klinke <jbk@google.com>

---
diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c
b/drivers/char/tpm/tpm_tis_i2c_cr50.c
index f6c0affbb4567..e5fb1ecc8fa2e 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
 #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;
 }

 /**

Re: [PATCH] drivers/char/tpm: Google TPM, additional DID:VID

[Paul Menzel]

Dear Jes,


Am 05.04.22 um 01:42 schrieb Jes Klinke:
> Accept one additional numerical value of DID:VID for Google TPM.

Mention the ID at least once in the commit message? In what device is it 
used?

For the summary, the prefix seems often just `tpm` or `char: tpm`.

tpm: cr50: Add new device/vendor ID 0x504a6666

> Signed-off-by: Jes B. Klinke <jbk@google.com>
> 

Superfluous blank line.

> ---
> diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c
> b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> index f6c0affbb4567..e5fb1ecc8fa2e 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
>   #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);

This line should be indented, shouldn’t it? Please send a properly 
formatted patch. Did you run it through `scripts/checkpatch.pl`?

> - 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;
>   }
> 
>   /**

Please also mention in the commit message, what is changed here.


Kind regards,

Paul