1. Patchew
  2. linux
  3. View series

[PATCH] tpm: Add new device/vendor ID 0x50666666

Jett Rink posted 1 patch 1 year, 6 months ago
There is a newer version of this series
drivers/char/tpm/tpm_tis_i2c_cr50.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
[PATCH] tpm: Add new device/vendor ID 0x50666666
Posted by Jett Rink 1 year, 6 months ago 
Accept another DID:VID for the next generation Google TPM. This TPM
has the same Ti50 firmware and fulfills the same interface.

Signed-off-by: Jett Rink <jettrink@chromium.org>
---

 drivers/char/tpm/tpm_tis_i2c_cr50.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c b/drivers/char/tpm/tpm_tis_i2c_cr50.c
index 86c9a1a43adb..d9b6abdcda5f 100644
--- a/drivers/char/tpm/tpm_tis_i2c_cr50.c
+++ b/drivers/char/tpm/tpm_tis_i2c_cr50.c
@@ -32,7 +32,8 @@
 #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_TI50_DT_I2C_DID_VID		0x504a6666L	/* Device and vendor ID reg value */
+#define TPM_TI50_OT_I2C_DID_VID		0x50666666L	/* 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 */
@@ -781,13 +782,17 @@ static int tpm_cr50_i2c_probe(struct i2c_client *client)
 	}
 
 	vendor = le32_to_cpup((__le32 *)buf);
-	if (vendor != TPM_CR50_I2C_DID_VID && vendor != TPM_TI50_I2C_DID_VID) {
+	if (vendor != TPM_CR50_I2C_DID_VID &&
+	    vendor != TPM_TI50_DT_I2C_DID_VID &&
+	    vendor != TPM_TI50_OT_I2C_DID_VID) {
 		dev_err(dev, "Vendor ID did not match! ID was %08x\n", vendor);
 		return -ENODEV;
 	}
 
 	dev_info(dev, "%s TPM 2.0 (i2c 0x%02x irq %d id 0x%x)\n",
-		 vendor == TPM_TI50_I2C_DID_VID ? "ti50" : "cr50",
+		 vendor == TPM_CR50_I2C_DID_VID	   ? "cr50" :
+		 vendor == TPM_TI50_DT_I2C_DID_VID ? "ti50 DT" :
+						     "ti50 OT",
 		 client->addr, client->irq, vendor >> 16);
 	return tpm_chip_register(chip);
 }
-- 
2.45.2.505.gda0bf45e8d-goog
Re: [PATCH] tpm: Add new device/vendor ID 0x50666666
Posted by Jett Rink 1 year, 5 months ago 
I wanted to check the status of this review. Is there something I did
incorrectly?

-Jett

On Mon, Jun 10, 2024 at 1:25 PM Jett Rink <jettrink@chromium.org> wrote:
>
> Accept another DID:VID for the next generation Google TPM. This TPM
> has the same Ti50 firmware and fulfills the same interface.
>
> Signed-off-by: Jett Rink <jettrink@chromium.org>
> ---
>
>  drivers/char/tpm/tpm_tis_i2c_cr50.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> index 86c9a1a43adb..d9b6abdcda5f 100644
> --- a/drivers/char/tpm/tpm_tis_i2c_cr50.c
> +++ b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> @@ -32,7 +32,8 @@
>  #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_TI50_DT_I2C_DID_VID                0x504a6666L     /* Device and vendor ID reg value */
> +#define TPM_TI50_OT_I2C_DID_VID                0x50666666L     /* 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 */
> @@ -781,13 +782,17 @@ static int tpm_cr50_i2c_probe(struct i2c_client *client)
>         }
>
>         vendor = le32_to_cpup((__le32 *)buf);
> -       if (vendor != TPM_CR50_I2C_DID_VID && vendor != TPM_TI50_I2C_DID_VID) {
> +       if (vendor != TPM_CR50_I2C_DID_VID &&
> +           vendor != TPM_TI50_DT_I2C_DID_VID &&
> +           vendor != TPM_TI50_OT_I2C_DID_VID) {
>                 dev_err(dev, "Vendor ID did not match! ID was %08x\n", vendor);
>                 return -ENODEV;
>         }
>
>         dev_info(dev, "%s TPM 2.0 (i2c 0x%02x irq %d id 0x%x)\n",
> -                vendor == TPM_TI50_I2C_DID_VID ? "ti50" : "cr50",
> +                vendor == TPM_CR50_I2C_DID_VID    ? "cr50" :
> +                vendor == TPM_TI50_DT_I2C_DID_VID ? "ti50 DT" :
> +                                                    "ti50 OT",
>                  client->addr, client->irq, vendor >> 16);
>         return tpm_chip_register(chip);
>  }
> --
> 2.45.2.505.gda0bf45e8d-goog
>
Re: [PATCH] tpm: Add new device/vendor ID 0x50666666
Posted by Jett Rink 1 year, 5 months ago 
Would it be possible to get feedback on this patch that just adds a
new DID_VID please?

-Jett


On Wed, Jun 26, 2024 at 8:03 AM Jett Rink <jettrink@chromium.org> wrote:
>
> I wanted to check the status of this review. Is there something I did
> incorrectly?
>
> -Jett
>
> On Mon, Jun 10, 2024 at 1:25 PM Jett Rink <jettrink@chromium.org> wrote:
> >
> > Accept another DID:VID for the next generation Google TPM. This TPM
> > has the same Ti50 firmware and fulfills the same interface.
> >
> > Signed-off-by: Jett Rink <jettrink@chromium.org>
> > ---
> >
> >  drivers/char/tpm/tpm_tis_i2c_cr50.c | 11 ++++++++---
> >  1 file changed, 8 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> > index 86c9a1a43adb..d9b6abdcda5f 100644
> > --- a/drivers/char/tpm/tpm_tis_i2c_cr50.c
> > +++ b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> > @@ -32,7 +32,8 @@
> >  #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_TI50_DT_I2C_DID_VID                0x504a6666L     /* Device and vendor ID reg value */
> > +#define TPM_TI50_OT_I2C_DID_VID                0x50666666L     /* 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 */
> > @@ -781,13 +782,17 @@ static int tpm_cr50_i2c_probe(struct i2c_client *client)
> >         }
> >
> >         vendor = le32_to_cpup((__le32 *)buf);
> > -       if (vendor != TPM_CR50_I2C_DID_VID && vendor != TPM_TI50_I2C_DID_VID) {
> > +       if (vendor != TPM_CR50_I2C_DID_VID &&
> > +           vendor != TPM_TI50_DT_I2C_DID_VID &&
> > +           vendor != TPM_TI50_OT_I2C_DID_VID) {
> >                 dev_err(dev, "Vendor ID did not match! ID was %08x\n", vendor);
> >                 return -ENODEV;
> >         }
> >
> >         dev_info(dev, "%s TPM 2.0 (i2c 0x%02x irq %d id 0x%x)\n",
> > -                vendor == TPM_TI50_I2C_DID_VID ? "ti50" : "cr50",
> > +                vendor == TPM_CR50_I2C_DID_VID    ? "cr50" :
> > +                vendor == TPM_TI50_DT_I2C_DID_VID ? "ti50 DT" :
> > +                                                    "ti50 OT",
> >                  client->addr, client->irq, vendor >> 16);
> >         return tpm_chip_register(chip);
> >  }
> > --
> > 2.45.2.505.gda0bf45e8d-goog
> >

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.