diff options
Diffstat (limited to 'src/drivers/crb/tis.c')
| -rw-r--r-- | src/drivers/crb/tis.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c index 04e255aa7f..1b398f74f4 100644 --- a/src/drivers/crb/tis.c +++ b/src/drivers/crb/tis.c @@ -23,7 +23,7 @@ static const struct { {0xa13a, 0x8086, "Intel iTPM"} }; -static const char *tis_get_dev_name(struct tpm2_info *info) +static const char *tis_get_dev_name(struct crb_tpm_info *info) { int i; @@ -36,7 +36,7 @@ static const char *tis_get_dev_name(struct tpm2_info *info) static tpm_result_t crb_tpm_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, uint8_t *recvbuf, size_t *rbuf_len) { - int len = tpm2_process_command(sendbuf, sbuf_size, recvbuf, *rbuf_len); + int len = crb_tpm_process_command(sendbuf, sbuf_size, recvbuf, *rbuf_len); if (len == 0) return TPM_CB_FAIL; @@ -48,17 +48,17 @@ static tpm_result_t crb_tpm_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, u tis_sendrecv_fn tis_probe(enum tpm_family *family) { - struct tpm2_info info; + struct crb_tpm_info info; /* Wake TPM up (if necessary) */ - if (tpm2_init()) + if (crb_tpm_init()) return NULL; /* CRB interface exists only in TPM2 */ if (family != NULL) *family = TPM_2; - tpm2_get_info(&info); + crb_tpm_get_info(&info); printk(BIOS_INFO, "Initialized TPM device %s revision %d\n", tis_get_dev_name(&info), info.revision); @@ -137,7 +137,7 @@ static tpm_result_t tpm_get_cap(uint32_t property, uint32_t *value) static int smbios_write_type43_tpm(struct device *dev, int *handle, unsigned long *current) { - struct tpm2_info info; + struct crb_tpm_info info; uint32_t tpm_manuf, tpm_family; uint32_t fw_ver1, fw_ver2; uint8_t major_spec_ver, minor_spec_ver; @@ -145,7 +145,7 @@ static int smbios_write_type43_tpm(struct device *dev, int *handle, unsigned lon if (tlcl_get_family() == TPM_1) return 0; - tpm2_get_info(&info); + crb_tpm_get_info(&info); /* If any of these have invalid values, assume TPM not present or disabled */ if (info.vendor_id == 0 || info.vendor_id == 0xFFFF || |