mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Jes B. Klinke" <jbk@chromium.org>
To: linux-integrity@vger.kernel.org
Cc: Paul Menzel <pmenzel@molgen.mpg.de>,
	"Jes B. Klinke" <jbk@chromium.org>,
	Jarkko Sakkinen <jarkko@kernel.org>,
	Jason Gunthorpe <jgg@ziepe.ca>, Peter Huewe <peterhuewe@gmx.de>,
	linux-kernel@vger.kernel.org
Subject: [PATCH] tpm: cr50: Add new device/vendor ID 0x504a6666
Date: Tue,  5 Apr 2022 10:37:41 -0700	[thread overview]
Message-ID: <20220405173741.4023216-1-jbk@chromium.org> (raw)

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 <jbk@chromium.org>
---

 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


             reply	other threads:[~2022-04-05 20:34 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-05 17:37 Jes B. Klinke [this message]
2022-04-07 10:14 ` Jarkko Sakkinen
2022-04-07 10:21 ` Paul Menzel
2022-04-14 12:08   ` Jarkko Sakkinen
2022-04-14 15:06     ` Paul Menzel
2022-04-14 16:51       ` Jarkko Sakkinen
2022-04-19 23:39         ` Jes Klinke
2022-04-14 12:06 ` Jarkko Sakkinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220405173741.4023216-1-jbk@chromium.org \
    --to=jbk@chromium.org \
    --cc=jarkko@kernel.org \
    --cc=jgg@ziepe.ca \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peterhuewe@gmx.de \
    --cc=pmenzel@molgen.mpg.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®