diff options
| -rw-r--r-- | src/drivers/crb/tis.c | 45 | ||||
| -rw-r--r-- | src/drivers/i2c/tpm/cr50.c | 1 | ||||
| -rw-r--r-- | src/drivers/i2c/tpm/tis.c | 41 | ||||
| -rw-r--r-- | src/drivers/i2c/tpm/tis_atmel.c | 19 | ||||
| -rw-r--r-- | src/drivers/i2c/tpm/tpm.c | 2 | ||||
| -rw-r--r-- | src/drivers/i2c/tpm/tpm.h | 1 | ||||
| -rw-r--r-- | src/drivers/pc80/tpm/tis.c | 42 | ||||
| -rw-r--r-- | src/drivers/spi/tpm/tis.c | 35 | ||||
| -rw-r--r-- | src/security/tpm/tis.h | 34 | ||||
| -rw-r--r-- | src/security/tpm/tss/tcg-1.2/tss.c | 17 | ||||
| -rw-r--r-- | src/security/tpm/tss/tcg-2.0/tss.c | 21 |
11 files changed, 157 insertions, 101 deletions
diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c index 0bb53c726d..a7d4fa7347 100644 --- a/src/drivers/crb/tis.c +++ b/src/drivers/crb/tis.c @@ -14,6 +14,8 @@ #include "tpm.h" #include "chip.h" +static unsigned int tpm_is_open; + static const struct { uint16_t vid; uint16_t did; @@ -33,41 +35,50 @@ static const char *tis_get_dev_name(struct tpm2_info *info) return "Unknown"; } -static int crb_tpm_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, uint8_t *recvbuf, - size_t *rbuf_len) +int tis_open(void) { - int len = tpm2_process_command(sendbuf, sbuf_size, recvbuf, *rbuf_len); - - if (len == 0) + if (tpm_is_open) { + printk(BIOS_ERR, "%s called twice.\n", __func__); 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 -1; + } + printk(BIOS_DEBUG, "%s: Intel PTT is active.\n", __func__); + } return 0; } -tis_sendrecv_fn tis_probe(void) +int tis_init(void) { struct tpm2_info info; - /* Wake TPM up (if necessary) */ + // Wake TPM up (if necessary) if (tpm2_init() != 0) - return NULL; + return -1; tpm2_get_info(&info); printk(BIOS_INFO, "Initialized TPM device %s revision %d\n", tis_get_dev_name(&info), info.revision); - 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; +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; + + return 0; } static void crb_tpm_fill_ssdt(const struct device *dev) diff --git a/src/drivers/i2c/tpm/cr50.c b/src/drivers/i2c/tpm/cr50.c index 593f201e68..d9088233c2 100644 --- a/src/drivers/i2c/tpm/cr50.c +++ b/src/drivers/i2c/tpm/cr50.c @@ -484,6 +484,7 @@ int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr) cr50_set_board_cfg(); } + chip->is_open = 1; return 0; } diff --git a/src/drivers/i2c/tpm/tis.c b/src/drivers/i2c/tpm/tis.c index 2cf32f6217..e9bf2cf706 100644 --- a/src/drivers/i2c/tpm/tis.c +++ b/src/drivers/i2c/tpm/tis.c @@ -19,6 +19,32 @@ static struct tpm_chip chip; #define TPM_CMD_COUNT_BYTE 2 #define TPM_CMD_ORDINAL_BYTE 6 +int tis_open(void) +{ + int rc; + + if (chip.is_open) { + printk(BIOS_DEBUG, "%s() called twice.\n", __func__); + return -1; + } + + rc = tpm_vendor_init(&chip, CONFIG_DRIVER_TPM_I2C_BUS, + CONFIG_DRIVER_TPM_I2C_ADDR); + if (rc < 0) + chip.is_open = 0; + + if (rc) + return -1; + + return 0; +} + +int tis_init(void) +{ + return tpm_vendor_probe(CONFIG_DRIVER_TPM_I2C_BUS, + CONFIG_DRIVER_TPM_I2C_ADDR); +} + static ssize_t tpm_transmit(const uint8_t *sbuf, size_t sbufsiz, void *rbuf, size_t rbufsiz) { @@ -81,8 +107,8 @@ out: return rc; } -static int i2c_tpm_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, - uint8_t *recvbuf, size_t *rbuf_len) +int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, + uint8_t *recvbuf, size_t *rbuf_len) { ASSERT(sbuf_size >= 10); @@ -118,14 +144,3 @@ static int i2c_tpm_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, return 0; } - -tis_sendrecv_fn tis_probe(void) -{ - if (tpm_vendor_probe(CONFIG_DRIVER_TPM_I2C_BUS, CONFIG_DRIVER_TPM_I2C_ADDR)) - return NULL; - - if (tpm_vendor_init(&chip, CONFIG_DRIVER_TPM_I2C_BUS, CONFIG_DRIVER_TPM_I2C_ADDR)) - return NULL; - - return &i2c_tpm_sendrecv; -} diff --git a/src/drivers/i2c/tpm/tis_atmel.c b/src/drivers/i2c/tpm/tis_atmel.c index 376586bdfb..669ac68f6c 100644 --- a/src/drivers/i2c/tpm/tis_atmel.c +++ b/src/drivers/i2c/tpm/tis_atmel.c @@ -22,8 +22,18 @@ struct tpm_output_header { uint32_t return_code; } __packed; -static int i2c_tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, - uint8_t *recvbuf, size_t *rbuf_len) +int tis_open(void) +{ + return 0; +} + +int tis_init(void) +{ + return 0; +} + +int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, + uint8_t *recvbuf, size_t *rbuf_len) { size_t hdr_bytes; struct tpm_output_header *header; @@ -102,8 +112,3 @@ static int i2c_tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, /* Successful transfer */ return 0; } - -tis_sendrecv_fn tis_probe(void) -{ - return &i2c_tis_sendrecv; -} diff --git a/src/drivers/i2c/tpm/tpm.c b/src/drivers/i2c/tpm/tpm.c index 7d335e9837..68b7042a64 100644 --- a/src/drivers/i2c/tpm/tpm.c +++ b/src/drivers/i2c/tpm/tpm.c @@ -507,6 +507,8 @@ int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr) tpm_dev.sleep_short = SLEEP_DURATION; tpm_dev.sleep_long = SLEEP_DURATION_LONG; + chip->is_open = 1; + chip->req_complete_mask = TPM_STS_DATA_AVAIL | TPM_STS_VALID; chip->req_complete_val = TPM_STS_DATA_AVAIL | TPM_STS_VALID; chip->req_canceled = TPM_STS_COMMAND_READY; diff --git a/src/drivers/i2c/tpm/tpm.h b/src/drivers/i2c/tpm/tpm.h index e4ca89397c..d4176cc511 100644 --- a/src/drivers/i2c/tpm/tpm.h +++ b/src/drivers/i2c/tpm/tpm.h @@ -38,6 +38,7 @@ enum tpm_timeout { #define TPM_DID_VID(l) (0x0006 | ((l) << 4)) struct tpm_chip { + int is_open; uint8_t req_complete_mask; uint8_t req_complete_val; uint8_t req_canceled; diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c index 42ad19298c..ce88ae012d 100644 --- a/src/drivers/pc80/tpm/tis.c +++ b/src/drivers/pc80/tpm/tis.c @@ -373,7 +373,7 @@ static int tis_command_ready(u8 locality) * Returns 0 on success (the device is found or was found during an earlier * invocation) or TPM_DRIVER_ERR if the device is not found. */ -static u32 pc80_tis_probe(void) +static u32 tis_probe(void) { const char *device_name = "unknown"; const char *vendor_name = device_name; @@ -608,11 +608,26 @@ static u32 tis_readresponse(u8 *buffer, size_t *len) } /* + * tis_init() + * + * Initialize the TPM device. Returns 0 on success or TPM_DRIVER_ERR on + * failure (in case device probing did not succeed). + */ +int tis_init(void) +{ + if (tis_probe()) + return TPM_DRIVER_ERR; + return 0; +} + +/* + * tis_open() + * * Requests access to locality 0 for the caller. * * Returns 0 on success, TPM_DRIVER_ERR on failure. */ -static int pc80_tis_open(void) +int tis_open(void) { u8 locality = 0; /* we use locality zero for everything */ @@ -638,6 +653,8 @@ static int pc80_tis_open(void) } /* + * tis_sendrecv() + * * Send the requested data to the TPM and then try to get its response * * @sendbuf - buffer of the data to send @@ -648,8 +665,8 @@ static int pc80_tis_open(void) * Returns 0 on success (and places the number of response bytes at recv_len) * or TPM_DRIVER_ERR on failure. */ -static int pc80_tpm_sendrecv(const uint8_t *sendbuf, size_t send_size, - uint8_t *recvbuf, size_t *recv_len) +int tis_sendrecv(const uint8_t *sendbuf, size_t send_size, + uint8_t *recvbuf, size_t *recv_len) { if (tis_senddata(sendbuf, send_size)) { printf("%s:%d failed sending data to TPM\n", @@ -661,23 +678,6 @@ static int pc80_tpm_sendrecv(const uint8_t *sendbuf, size_t send_size, } /* - * tis_probe() - * - * Probe for the TPM device and set it up for use within locality 0. Returns - * pointer to send-receive function on success or NULL on failure. - */ -tis_sendrecv_fn tis_probe(void) -{ - if (pc80_tis_probe()) - return NULL; - - if (pc80_tis_open()) - return NULL; - - return &pc80_tpm_sendrecv; -} - -/* * tis_setup_interrupt() * * Set up the interrupt vector and polarity for locality 0 and diff --git a/src/drivers/spi/tpm/tis.c b/src/drivers/spi/tpm/tis.c index 310b1c09ea..b9b2a4a5cb 100644 --- a/src/drivers/spi/tpm/tis.c +++ b/src/drivers/spi/tpm/tis.c @@ -5,6 +5,8 @@ #include "tpm.h" +static unsigned int tpm_is_open; + static const struct { uint16_t vid; uint16_t did; @@ -27,20 +29,16 @@ static const char *tis_get_dev_name(struct tpm2_info *info) return "Unknown"; } -static int tpm_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, - uint8_t *recvbuf, size_t *rbuf_len) +int tis_open(void) { - int len = tpm2_process_command(sendbuf, sbuf_size, recvbuf, *rbuf_len); - - if (len == 0) + if (tpm_is_open) { + printk(BIOS_ERR, "%s() called twice.\n", __func__); return -1; - - *rbuf_len = len; - + } return 0; } -tis_sendrecv_fn tis_probe(void) +int tis_init(void) { struct spi_slave spi; struct tpm2_info info; @@ -48,12 +46,12 @@ tis_sendrecv_fn tis_probe(void) if (spi_setup_slave(CONFIG_DRIVER_TPM_SPI_BUS, CONFIG_DRIVER_TPM_SPI_CHIP, &spi)) { printk(BIOS_ERR, "Failed to setup TPM SPI slave\n"); - return NULL; + return -1; } if (tpm2_init(&spi)) { printk(BIOS_ERR, "Failed to initialize TPM SPI interface\n"); - return NULL; + return -1; } tpm2_get_info(&info); @@ -61,5 +59,18 @@ tis_sendrecv_fn tis_probe(void) printk(BIOS_INFO, "Initialized TPM device %s revision %d\n", tis_get_dev_name(&info), info.revision); - return &tpm_sendrecv; + 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; + + return 0; } diff --git a/src/security/tpm/tis.h b/src/security/tpm/tis.h index df39498462..9b343330e3 100644 --- a/src/security/tpm/tis.h +++ b/src/security/tpm/tis.h @@ -32,6 +32,25 @@ enum tis_status { }; /* + * tis_init() + * + * Initialize the TPM device. Returns 0 on success or -1 on + * failure (in case device probing did not succeed). + */ +int tis_init(void); + +/* + * tis_open() + * + * Requests access to locality 0 for the caller. + * + * Returns 0 on success, -1 on failure. + */ +int tis_open(void); + +/* + * tis_sendrecv() + * * Send the requested data to the TPM and then try to get its response * * @sendbuf - buffer of the data to send @@ -42,19 +61,8 @@ enum tis_status { * Returns 0 on success (and places the number of response bytes at recv_len) * or -1 on failure. */ -typedef int (*tis_sendrecv_fn)(const u8 *sendbuf, size_t send_size, u8 *recvbuf, - size_t *recv_len); - -/* - * tis_probe() - * - * Probe for the TPM device and set it up for use within locality 0. Returns - * pointer to send-receive function on success or NULL on failure. - * - * Do not call this explicitly, it's meant to be used exclusively by TSS - * implementation (tlcl_lib_init() function to be specific). - */ -tis_sendrecv_fn tis_probe(void); +int tis_sendrecv(const u8 *sendbuf, size_t send_size, u8 *recvbuf, + size_t *recv_len); /* TODO: This is supposed to be used only for Google TPM. Consider moving this to drivers/tpm/cr50.h. */ diff --git a/src/security/tpm/tss/tcg-1.2/tss.c b/src/security/tpm/tss/tcg-1.2/tss.c index 7f0607ba82..39c44eca9f 100644 --- a/src/security/tpm/tss/tcg-1.2/tss.c +++ b/src/security/tpm/tss/tcg-1.2/tss.c @@ -24,18 +24,12 @@ #include <console/console.h> #define VBDEBUG(format, args...) printk(BIOS_DEBUG, format, ## args) -static tis_sendrecv_fn tis_sendrecv; - static int tpm_send_receive(const uint8_t *request, uint32_t request_length, uint8_t *response, uint32_t *response_length) { size_t len = *response_length; - - if (tis_sendrecv == NULL) - die("TSS 1.2 wasn't initialized\n"); - if (tis_sendrecv(request, request_length, response, &len)) return VB2_ERROR_UNKNOWN; /* check 64->32bit overflow and (re)check response buffer overflow */ @@ -146,15 +140,20 @@ static uint32_t send(const uint8_t *command) /* Exported functions. */ +static uint8_t tlcl_init_done; + uint32_t tlcl_lib_init(void) { - if (tis_sendrecv != NULL) + if (tlcl_init_done) return VB2_SUCCESS; - tis_sendrecv = tis_probe(); - if (tis_sendrecv == NULL) + if (tis_init()) + return VB2_ERROR_UNKNOWN; + if (tis_open()) return VB2_ERROR_UNKNOWN; + tlcl_init_done = 1; + return VB2_SUCCESS; } diff --git a/src/security/tpm/tss/tcg-2.0/tss.c b/src/security/tpm/tss/tcg-2.0/tss.c index a787b13fa1..d228c7f6a8 100644 --- a/src/security/tpm/tss/tcg-2.0/tss.c +++ b/src/security/tpm/tss/tcg-2.0/tss.c @@ -16,8 +16,6 @@ * TPM2 specification. */ -static tis_sendrecv_fn tis_sendrecv; - void *tpm_process_command(TPM_CC command, void *command_body) { struct obuf ob; @@ -28,9 +26,6 @@ void *tpm_process_command(TPM_CC command, void *command_body) /* Command/response buffer. */ static uint8_t cr_buffer[TPM_BUFFER_SIZE]; - if (tis_sendrecv == NULL) - die("TSS 2.0 wasn't initialized\n"); - obuf_init(&ob, cr_buffer, sizeof(cr_buffer)); if (tpm_marshal_command(command, command_body, &ob) < 0) { @@ -206,18 +201,26 @@ uint32_t tlcl_clear_control(bool disable) return TPM_SUCCESS; } +static uint8_t tlcl_init_done; + /* This function is called directly by vboot, uses vboot return types. */ uint32_t tlcl_lib_init(void) { - if (tis_sendrecv != NULL) + if (tlcl_init_done) return VB2_SUCCESS; - tis_sendrecv = tis_probe(); - if (tis_sendrecv == NULL) { - printk(BIOS_ERR, "%s: tis_probe returned error\n", __func__); + if (tis_init()) { + printk(BIOS_ERR, "%s: tis_init returned error\n", __func__); return VB2_ERROR_UNKNOWN; } + if (tis_open()) { + printk(BIOS_ERR, "%s: tis_open returned error\n", __func__); + return VB2_ERROR_UNKNOWN; + } + + tlcl_init_done = 1; + return VB2_SUCCESS; } |