summaryrefslogtreecommitdiff
path: root/src/drivers/tpm
diff options
context:
space:
mode:
authorJes Klinke <jbk@google.com>2022-03-28 14:22:24 -0700
committerMartin L Roth <martinroth@google.com>2022-04-24 22:09:42 +0000
commit1430b043f0376f00d4e1064d231745cb3e62edf0 (patch)
tree057384f10a7fefa2de190b203e143d0471f94196 /src/drivers/tpm
parent9d8df30950710635c9e7c099ef8d0c8d047658ca (diff)
tpm: Allow separate handling of Google Ti50 TPM
A new iteration of Google's TPM implementation will advertize a new DID:VID, but otherwise follow the same protocol as the earlier design. This change makes use of Kconfigs TPM_GOOGLE_CR50 and TPM_GOOGLE_TI50 to be able to take slightly different code paths, when e.g. evaluating whether TPM firmware is new enough to support certain features. Change-Id: I1e1f8eb9b94fc2d5689656335dc1135b47880986 Signed-off-by: Jes B. Klinke <jbk@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/63158 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/drivers/tpm')
-rw-r--r--src/drivers/tpm/cr50.c29
-rw-r--r--src/drivers/tpm/cr50.h4
2 files changed, 19 insertions, 14 deletions
diff --git a/src/drivers/tpm/cr50.c b/src/drivers/tpm/cr50.c
index 4ab01fbf92..22ca3dd2bb 100644
--- a/src/drivers/tpm/cr50.c
+++ b/src/drivers/tpm/cr50.c
@@ -5,6 +5,9 @@
#include <string.h>
#include <types.h>
+#define CR50_DID_VID 0x00281ae0L
+#define TI50_DID_VID 0x504a6666L
+
#define CR50_BOARD_CFG_LOCKBIT_MASK 0x80000000U
#define CR50_BOARD_CFG_FEATUREBITS_MASK 0x3FFFFFFFU
@@ -84,7 +87,7 @@ static uint32_t cr50_get_board_cfg(void)
const enum cb_err ret = tis_vendor_read(get_reg_addr(CR50_BOARD_CFG_REG), &value,
sizeof(value));
if (ret != CB_SUCCESS) {
- printk(BIOS_INFO, "Error reading from cr50\n");
+ printk(BIOS_ERR, "Error reading from Cr50\n");
return 0;
}
@@ -96,6 +99,11 @@ static uint32_t cr50_get_board_cfg(void)
*/
enum cb_err cr50_set_board_cfg(void)
{
+ /* If we get here and we aren't cr50, then we must be ti50 which does
+ * not currently need to support a board_cfg register. */
+ if (!CONFIG(TPM_GOOGLE_CR50))
+ return CB_SUCCESS;
+
struct cr50_firmware_version ver;
enum cb_err ret;
uint32_t value;
@@ -109,7 +117,7 @@ enum cb_err cr50_set_board_cfg(void)
/* Set the CR50_BOARD_CFG register, for e.g. asking cr50 to use longer ready pulses. */
ret = tis_vendor_read(get_reg_addr(CR50_BOARD_CFG_REG), &value, sizeof(value));
if (ret != CB_SUCCESS) {
- printk(BIOS_INFO, "Error reading from cr50\n");
+ printk(BIOS_ERR, "Error reading from Cr50\n");
return CB_ERR;
}
@@ -142,19 +150,15 @@ enum cb_err cr50_set_board_cfg(void)
bool cr50_is_long_interrupt_pulse_enabled(void)
{
- /*
- * Ti50 FW versions under 0.15 don't support the board cfg register,
- * and all Ti50 versions only support long IRQ pulses.
- * TODO: Remove this after all Ti50 stocks uprev to 0.15 or above.
- */
- if (CONFIG(MAINBOARD_NEEDS_I2C_TI50_WORKAROUND))
- return true;
+ if (CONFIG(TPM_GOOGLE_CR50))
+ return !!(cr50_get_board_cfg() & CR50_BOARD_CFG_100US_READY_PULSE);
- return !!(cr50_get_board_cfg() & CR50_BOARD_CFG_100US_READY_PULSE);
+ /* Ti50 and future GSCs will support only long interrupt pulses. */
+ return true;
}
static enum cb_err cr50_parse_fw_version(const char *version_str,
- struct cr50_firmware_version *ver)
+ struct cr50_firmware_version *ver)
{
int epoch, major, minor;
@@ -219,6 +223,7 @@ enum cb_err cr50_get_firmware_version(struct cr50_firmware_version *version)
}
success:
- *version = cr50_firmware_version;
+ if (version)
+ *version = cr50_firmware_version;
return CB_SUCCESS;
}
diff --git a/src/drivers/tpm/cr50.h b/src/drivers/tpm/cr50.h
index f754e133b8..b39d7442c5 100644
--- a/src/drivers/tpm/cr50.h
+++ b/src/drivers/tpm/cr50.h
@@ -5,7 +5,7 @@
#include <types.h>
-/* Structure describing the elements of Cr50 firmware version. */
+/* Structure describing the elements of GSC firmware version. */
struct cr50_firmware_version {
int epoch;
int major;
@@ -15,7 +15,7 @@ struct cr50_firmware_version {
/* Indicates whether Cr50 ready pulses are guaranteed to be at least 100us. */
bool cr50_is_long_interrupt_pulse_enabled(void);
-/* Get the Cr50 firmware version information. */
+/* Get the GSC firmware version information. */
enum cb_err cr50_get_firmware_version(struct cr50_firmware_version *version);
/* Set the BOARD_CFG register depending on Cr50 Kconfigs */