Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
tpm: cr50: Add new device/vendor ID 0x504a6666
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>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
authored by
Jes B. Klinke
and committed by
Jarkko Sakkinen
9c438fde
6422cbd3
+4
-3
+4
-3
drivers/char/tpm/tpm_tis_i2c_cr50.c
+4
-3
drivers/char/tpm/tpm_tis_i2c_cr50.c
···
31
31
#define TPM_CR50_TIMEOUT_SHORT_MS 2 /* Short timeout during transactions */
32
32
#define TPM_CR50_TIMEOUT_NOIRQ_MS 20 /* Timeout for TPM ready without IRQ */
33
33
#define TPM_CR50_I2C_DID_VID 0x00281ae0L /* Device and vendor ID reg value */
34
+
#define TPM_TI50_I2C_DID_VID 0x504a6666L /* Device and vendor ID reg value */
34
35
#define TPM_CR50_I2C_MAX_RETRIES 3 /* Max retries due to I2C errors */
35
36
#define TPM_CR50_I2C_RETRY_DELAY_LO 55 /* Min usecs between retries on I2C */
36
37
#define TPM_CR50_I2C_RETRY_DELAY_HI 65 /* Max usecs between retries on I2C */
···
743
742
}
744
743
745
744
vendor = le32_to_cpup((__le32 *)buf);
746
-
if (vendor != TPM_CR50_I2C_DID_VID) {
745
+
if (vendor != TPM_CR50_I2C_DID_VID && vendor != TPM_TI50_I2C_DID_VID) {
747
746
dev_err(dev, "Vendor ID did not match! ID was %08x\n", vendor);
748
747
tpm_cr50_release_locality(chip, true);
749
748
return -ENODEV;
750
749
}
751
750
752
-
dev_info(dev, "cr50 TPM 2.0 (i2c 0x%02x irq %d id 0x%x)\n",
751
+
dev_info(dev, "%s TPM 2.0 (i2c 0x%02x irq %d id 0x%x)\n",
752
+
vendor == TPM_TI50_I2C_DID_VID ? "ti50" : "cr50",
753
753
client->addr, client->irq, vendor >> 16);
754
-
755
754
return tpm_chip_register(chip);
756
755
}
757
756