diff options
| author | Sergii Dmytruk <sergii.dmytruk@3mdeb.com> | 2022-10-29 20:42:28 +0300 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-12-21 14:48:00 +0000 |
| commit | d43154486d27323f64334203e9bc8baf08af6845 (patch) | |
| tree | 0f232ce82fc77c1aa7ed5aba2303283fe7a5e78c /src/drivers/crb | |
| parent | 86f845ad0d864f44c21db964f0fdb213c41a152c (diff) | |
security/tpm/: turn tis_{init,open} into tis_probe
Init was always followed by open and after successful initialization we
need only send-receive function, which is now returned by tis_probe on
success further reducing number of functions to export from drivers.
Change-Id: Ib4ce35ada24e3959ea1a518c29d431b4ae123809
Ticket: https://ticket.coreboot.org/issues/433
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68991
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/drivers/crb')
| -rw-r--r-- | src/drivers/crb/tis.c | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c index a7d4fa7347..0bb53c726d 100644 --- a/src/drivers/crb/tis.c +++ b/src/drivers/crb/tis.c @@ -14,8 +14,6 @@ #include "tpm.h" #include "chip.h" -static unsigned int tpm_is_open; - static const struct { uint16_t vid; uint16_t did; @@ -35,50 +33,41 @@ static const char *tis_get_dev_name(struct tpm2_info *info) return "Unknown"; } -int tis_open(void) +static int crb_tpm_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, uint8_t *recvbuf, + size_t *rbuf_len) { - if (tpm_is_open) { - printk(BIOS_ERR, "%s called twice.\n", __func__); + int len = tpm2_process_command(sendbuf, sbuf_size, recvbuf, *rbuf_len); + + if (len == 0) return -1; - } - if (CONFIG(HAVE_INTEL_PTT)) { - if (!ptt_active()) { - printk(BIOS_ERR, "%s: Intel PTT is not active.\n", __func__); - return -1; - } - printk(BIOS_DEBUG, "%s: Intel PTT is active.\n", __func__); - } + *rbuf_len = len; return 0; } -int tis_init(void) +tis_sendrecv_fn tis_probe(void) { struct tpm2_info info; - // Wake TPM up (if necessary) + /* Wake TPM up (if necessary) */ if (tpm2_init() != 0) - return -1; + return NULL; tpm2_get_info(&info); printk(BIOS_INFO, "Initialized TPM device %s revision %d\n", tis_get_dev_name(&info), info.revision); - return 0; -} - -int tis_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); - - if (len == 0) - return -1; - - *rbuf_len = len; + if (CONFIG(HAVE_INTEL_PTT)) { + if (!ptt_active()) { + printk(BIOS_ERR, "%s: Intel PTT is not active.\n", __func__); + return NULL; + } + printk(BIOS_DEBUG, "%s: Intel PTT is active.\n", __func__); + } - return 0; + return &crb_tpm_sendrecv; } static void crb_tpm_fill_ssdt(const struct device *dev) |