Attention is currently required from: Christian Walter, Erik van den Bogaert, Felix Held, Frans Hendriks, Fred Reitberger, Jason Glenesk, Julius Werner, Matt DeVillier, Nick Vaccaro, Subrata Banik, Yu-Ping Wu.
Jon Murphy has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/77666?usp=email )
Change subject: treewide: convert to TPM_RESULT ......................................................................
treewide: convert to TPM_RESULT
Convert TPM functions to return TPM_RESULT values to match the TCG standard.
BUG=b:296439237 TEST=build and boot to Skyrim BRANCH=firmware-skyrim-15390.B
Change-Id: Ifdf9ff6c2a1f9b938dbb04d245799391115eb6b1 Signed-off-by: Jon Murphy jpmurphy@google.com --- M src/drivers/crb/tis.c M src/drivers/crb/tpm.c M src/drivers/crb/tpm.h M src/drivers/i2c/tpm/cr50.c M src/drivers/i2c/tpm/tis.c M src/drivers/i2c/tpm/tis_atmel.c M src/drivers/i2c/tpm/tpm.h M src/drivers/pc80/tpm/tis.c M src/drivers/spi/tpm/tis.c M src/drivers/spi/tpm/tpm.c M src/mainboard/facebook/fbg1701/romstage.c M src/mainboard/google/brya/mainboard.c M src/mainboard/google/dedede/mainboard.c M src/mainboard/google/volteer/mainboard.c M src/security/tpm/tis.h M src/security/tpm/tspi.h M src/security/tpm/tspi/crtm.c M src/security/tpm/tspi/crtm.h M src/security/tpm/tspi/tspi.c M src/security/tpm/tss.h M src/security/tpm/tss/common/tss_common.h M src/security/tpm/tss/tcg-1.2/tss.c M src/security/tpm/tss/tcg-2.0/tss.c M src/security/tpm/tss/vendor/cr50/cr50.c M src/security/tpm/tss/vendor/cr50/cr50.h M src/security/tpm/tss_errors.h M src/security/vboot/antirollback.h M src/security/vboot/mrc_cache_hash_tpm.c M src/security/vboot/secdata_mock.c M src/security/vboot/secdata_tpm.c M src/security/vboot/tpm_common.c M src/security/vboot/tpm_common.h M src/security/vboot/vbios_cache_hash_tpm.c M src/security/vboot/vboot_common.c M src/security/vboot/vboot_logic.c M src/soc/amd/common/psp_verstage/psp_verstage.c M src/vendorcode/eltan/security/mboot/mboot.c M src/vendorcode/eltan/security/mboot/mboot.h M src/vendorcode/eltan/security/verified_boot/vboot_check.c M src/vendorcode/google/chromeos/cr50_enable_update.c M src/vendorcode/google/chromeos/cse_board_reset.c M src/vendorcode/google/chromeos/tpm2.c 42 files changed, 535 insertions(+), 497 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/77666/1
diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c index a7d4fa7..d4765a3 100644 --- a/src/drivers/crb/tis.c +++ b/src/drivers/crb/tis.c @@ -35,50 +35,52 @@ return "Unknown"; }
-int tis_open(void) +TPM_RESULT tis_open(void) { if (tpm_is_open) { printk(BIOS_ERR, "%s called twice.\n", __func__); - return -1; + return TPM_FAIL; }
if (CONFIG(HAVE_INTEL_PTT)) { if (!ptt_active()) { printk(BIOS_ERR, "%s: Intel PTT is not active.\n", __func__); - return -1; + return TPM_FAIL; } printk(BIOS_DEBUG, "%s: Intel PTT is active.\n", __func__); }
- return 0; + return TPM_SUCCESS; }
-int tis_init(void) +TPM_RESULT tis_init(void) { struct tpm2_info info;
// Wake TPM up (if necessary) - if (tpm2_init() != 0) - return -1; + TPM_RESULT rc = tpm2_init(); + if (rc) + return rc;
tpm2_get_info(&info);
printk(BIOS_INFO, "Initialized TPM device %s revision %d\n", tis_get_dev_name(&info), info.revision);
- return 0; + return TPM_SUCCESS; }
-int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, uint8_t *recvbuf, size_t *rbuf_len) +TPM_RESULT 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; + return TPM_FAIL;
*rbuf_len = len;
- return 0; + return TPM_SUCCESS; }
static void crb_tpm_fill_ssdt(const struct device *dev) @@ -122,7 +124,7 @@ { TPMS_CAPABILITY_DATA cap_data; int i; - uint32_t status; + TPM_RESULT status;
if (!value) return -1; diff --git a/src/drivers/crb/tpm.c b/src/drivers/crb/tpm.c index 858aeb7..e5e7581 100644 --- a/src/drivers/crb/tpm.c +++ b/src/drivers/crb/tpm.c @@ -67,7 +67,7 @@ }
/* Wait for Reg to be expected Value */ -static int crb_wait_for_reg32(const void *addr, uint32_t timeoutMs, uint32_t mask, +static TPM_RESULT crb_wait_for_reg32(const void *addr, uint32_t timeoutMs, uint32_t mask, uint32_t expectedValue) { uint32_t regValue; @@ -81,13 +81,13 @@ regValue = read32(addr);
if ((regValue & mask) == expectedValue) - return 0; + return TPM_SUCCESS;
if (stopwatch_expired(&sw)) { printk(BIOS_ERR, "CRB_WAIT: Error - Returning Zero with RegValue: %08x, Mask: %08x, Expected: %08x\n", regValue, mask, expectedValue); - return -1; + return TPM_RETRY; } } } @@ -96,27 +96,27 @@ * * Checks if the CRB Interface is ready */ -static int crb_probe(void) +static TPM_RESULT crb_probe(void) { uint64_t tpmStatus = read64(CRB_REG(cur_loc, CRB_REG_INTF_ID)); printk(BIOS_SPEW, "Interface ID Reg. %llx\n", tpmStatus);
if ((tpmStatus & CRB_INTF_REG_CAP_CRB) == 0) { printk(BIOS_DEBUG, "TPM: CRB Interface is not supported.\n"); - return -1; + return TPM_FAIL; }
if ((tpmStatus & (0xf)) != 1) { printk(BIOS_DEBUG, "TPM: CRB Interface is not active. System needs reboot in order to active TPM.\n"); write32(CRB_REG(cur_loc, CRB_REG_INTF_ID), CRB_INTF_REG_INTF_SEL); - return -1; + return TPM_FAIL; }
write32(CRB_REG(cur_loc, CRB_REG_INTF_ID), CRB_INTF_REG_INTF_SEL); write32(CRB_REG(cur_loc, CRB_REG_INTF_ID), CRB_INTF_REG_INTF_LOCK);
- return 0; + return TPM_SUCCESS; }
/* @@ -129,7 +129,7 @@ uint8_t locality = (read8(CRB_REG(0, CRB_REG_LOC_STATE)) >> 2) & 0x07; printk(BIOS_SPEW, "Active locality: %i\n", locality);
- int rc = crb_wait_for_reg32(CRB_REG(locality, CRB_REG_LOC_STATE), 750, + TPM_RESULT rc = crb_wait_for_reg32(CRB_REG(locality, CRB_REG_LOC_STATE), 750, LOC_STATE_LOC_ASSIGN, LOC_STATE_LOC_ASSIGN);
if (!rc && (locality == 0)) @@ -157,16 +157,16 @@ }
/* Switch Device into a Ready State */ -static int crb_switch_to_ready(void) +static TPM_RESULT crb_switch_to_ready(void) { /* Transition into ready state */ write8(CRB_REG(cur_loc, CRB_REG_REQUEST), 0x1); - int rc = crb_wait_for_reg32(CRB_REG(cur_loc, CRB_REG_REQUEST), 200, + TPM_RESULT rc = crb_wait_for_reg32(CRB_REG(cur_loc, CRB_REG_REQUEST), 200, CRB_REG_REQUEST_CMD_RDY, 0x0); if (rc) { printk(BIOS_ERR, "TPM: Error - TPM did not transition into ready state in time.\n"); - return -1; + return rc; }
/* Check TPM_CRB_CTRL_STS[0] to be "0" - no unrecoverable error */ @@ -174,10 +174,10 @@ 0x0); if (rc) { printk(BIOS_ERR, "TPM: Fatal Error - Could not recover.\n"); - return -1; + return rc; }
- return 0; + return TPM_SUCCESS; }
/* @@ -188,11 +188,11 @@ * normal bring up mode. * */ -int tpm2_init(void) +TPM_RESULT tpm2_init(void) { if (crb_probe()) { printk(BIOS_ERR, "TPM: Probe failed.\n"); - return -1; + return TPM_FAIL; }
/* Read back control area structure */ @@ -211,7 +211,7 @@ /* Good to go. */ printk(BIOS_SPEW, "TPM: CRB TPM initialized successfully\n");
- return 0; + return TPM_SUCCESS; }
static void set_ptt_cmd_resp_buffers(void) @@ -231,7 +231,7 @@ size_t tpm2_process_command(const void *tpm2_command, size_t command_size, void *tpm2_response, size_t max_response) { - int rc; + TPM_RESULT rc;
if (command_size > control_area.command_size) { printk(BIOS_ERR, "TPM: Command size is too big.\n"); diff --git a/src/drivers/crb/tpm.h b/src/drivers/crb/tpm.h index be26be2..2cfab58 100644 --- a/src/drivers/crb/tpm.h +++ b/src/drivers/crb/tpm.h @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* This is a driver for a Command Response Buffer Interface */
+#include <security/tpm/tss/common/tss_common.h> + /* CRB driver */ /* address of locality 0 (CRB) */ #define TPM_CRB_BASE_ADDRESS CONFIG_CRB_TPM_BASE_ADDRESS @@ -58,7 +60,7 @@ uint16_t revision; };
-int tpm2_init(void); +TPM_RESULT tpm2_init(void); void tpm2_get_info(struct tpm2_info *tpm2_info); size_t tpm2_process_command(const void *tpm2_command, size_t command_size, void *tpm2_response, size_t max_response); diff --git a/src/drivers/i2c/tpm/cr50.c b/src/drivers/i2c/tpm/cr50.c index 0bf6a3c..7f1b2ef 100644 --- a/src/drivers/i2c/tpm/cr50.c +++ b/src/drivers/i2c/tpm/cr50.c @@ -56,12 +56,12 @@ * 2) wait for TPM to indicate it is ready * 3) read 'len' bytes of TPM response into the provided 'buffer' * - * Return -1 on error, 0 on success. + * Returns TSS Return Code from TCG TPM Structures. See tss_errors.h */ -static int cr50_i2c_read(uint8_t addr, uint8_t *buffer, size_t len) +static TPM_RESULT cr50_i2c_read(uint8_t addr, uint8_t *buffer, size_t len) { if (tpm_dev.addr == 0) - return -1; + return TPM_FAIL;
/* Clear interrupt before starting transaction */ cr50_plat_irq_status(); @@ -69,20 +69,20 @@ /* Send the register address byte to the TPM */ if (i2c_write_raw(tpm_dev.bus, tpm_dev.addr, &addr, 1)) { printk(BIOS_ERR, "%s: Address write failed\n", __func__); - return -1; + return TPM_FAIL; }
/* Wait for TPM to be ready with response data */ if (cr50_wait_tpm_ready() != CB_SUCCESS) - return -1; + return TPM_FAIL;
/* Read response data from the TPM */ if (i2c_read_raw(tpm_dev.bus, tpm_dev.addr, buffer, len)) { printk(BIOS_ERR, "%s: Read response failed\n", __func__); - return -1; + return TPM_FAIL; }
- return 0; + return TPM_SUCCESS; }
/* @@ -96,14 +96,14 @@ * 2) send the address+data to the TPM * 3) wait for TPM to indicate it is done writing * - * Returns -1 on error, 0 on success. + * Returns TSS Return Code from TCG TPM Structures. See tss_errors.h */ -static int cr50_i2c_write(uint8_t addr, const uint8_t *buffer, size_t len) +static TPM_RESULT cr50_i2c_write(uint8_t addr, const uint8_t *buffer, size_t len) { if (tpm_dev.addr == 0) - return -1; + return TPM_BAD_PARAMETER; if (len > CR50_MAX_BUFSIZE) - return -1; + return TPM_FAIL;
/* Prepend the 'register address' to the buffer */ tpm_dev.buf[0] = addr; @@ -115,11 +115,11 @@ /* Send write request buffer with address */ if (i2c_write_raw(tpm_dev.bus, tpm_dev.addr, tpm_dev.buf, len + 1)) { printk(BIOS_ERR, "%s: Error writing to TPM\n", __func__); - return -1; + return TPM_FAIL; }
/* Wait for TPM to be ready */ - return cr50_wait_tpm_ready() == CB_SUCCESS ? 0 : -1; + return cr50_wait_tpm_ready() == CB_SUCCESS ? TPM_SUCCESS : TPM_FAIL; }
/* @@ -128,11 +128,13 @@ * * This function will make sure that the AP does not proceed with boot until * TPM finished reset processing. + * + * Returns TSS Return Code from TCG TPM Structures. See tss_errors.h */ -static int process_reset(void) +static TPM_RESULT process_reset(void) { struct stopwatch sw; - int rc = 0; + TPM_RESULT rc = 0; uint8_t access;
/* @@ -162,58 +164,66 @@ printk(BIOS_INFO, "TPM ready after %lld ms\n", stopwatch_duration_msecs(&sw));
- return 0; + return TPM_SUCCESS; } while (!stopwatch_expired(&sw));
- if (rc) + if (rc) { printk(BIOS_ERR, "Failed to read TPM\n"); - else + return rc; + } else printk(BIOS_ERR, "TPM failed to reset after %lld ms, status: %#x\n", stopwatch_duration_msecs(&sw), access); - - return -1; + return TPM_FAIL; }
/* * Locality could be already claimed (if this is a later coreboot stage and * the RO did not release it), or not yet claimed, if this is verstage or the * older RO did release it. + * + * Returns TSS Return Code from TCG TPM Structures. See tss_errors.h */ -static int claim_locality(void) +static TPM_RESULT claim_locality(void) { uint8_t access; const uint8_t mask = TPM_ACCESS_VALID | TPM_ACCESS_ACTIVE_LOCALITY;
if (cr50_i2c_read(TPM_ACCESS(0), &access, sizeof(access))) - return -1; + return TPM_FAIL;
if ((access & mask) == mask) { printk(BIOS_INFO, "Locality already claimed\n"); - return 0; + return TPM_SUCCESS; }
access = TPM_ACCESS_REQUEST_USE; if (cr50_i2c_write(TPM_ACCESS(0), &access, sizeof(access))) - return -1; + return TPM_FAIL;
if (cr50_i2c_read(TPM_ACCESS(0), &access, sizeof(access))) - return -1; + return TPM_FAIL;
if ((access & mask) != mask) { printk(BIOS_INFO, "Failed to claim locality.\n"); - return -1; + return TPM_FAIL; }
- return 0; + return TPM_SUCCESS; }
-/* cr50 requires all 4 bytes of status register to be read */ +/* + * cr50 requires all 4 bytes of status register to be read + * + * Returns lowest 8-bits of the TIS Status register value + * see tis_status bit mask enumerated type in tis.h. + * Return 0 on error. + */ static uint8_t cr50_i2c_tis_status(void) { uint8_t buf[4]; - if (cr50_i2c_read(TPM_STS(tpm_dev.locality), buf, sizeof(buf)) < 0) { + if (cr50_i2c_read(TPM_STS(tpm_dev.locality), buf, sizeof(buf)) != TPM_SUCCESS) { printk(BIOS_ERR, "%s: Failed to read status\n", __func__); return 0; } @@ -229,8 +239,11 @@ }
/* cr50 uses bytes 3:2 of status register for burst count and - * all 4 bytes must be read */ -static int cr50_i2c_wait_burststs(uint8_t mask, size_t *burst, int *status) + * all 4 bytes must be read + * + * Returns TSS Return Code from TCG TPM Structures. See tss_errors.h + */ +static TPM_RESULT cr50_i2c_wait_burststs(uint8_t mask, size_t *burst, int *status) { uint8_t buf[4]; struct stopwatch sw; @@ -249,13 +262,13 @@ /* Check if mask matches and burst is valid */ if ((*status & mask) == mask && *burst > 0 && *burst <= CR50_MAX_BUFSIZE) - return 0; + return TPM_SUCCESS;
mdelay(CR50_TIMEOUT_SHORT_MS); }
printk(BIOS_ERR, "%s: Timeout reading burst and status\n", __func__); - return -1; + return TPM_FAIL; }
static int cr50_i2c_tis_recv(uint8_t *buf, size_t buf_len) @@ -268,7 +281,7 @@ if (buf_len < TPM_HEADER_SIZE) goto out_err;
- if (cr50_i2c_wait_burststs(mask, &burstcnt, &status) < 0) { + if (cr50_i2c_wait_burststs(mask, &burstcnt, &status)) { printk(BIOS_ERR, "%s: First chunk not available\n", __func__); goto out_err; } @@ -291,7 +304,7 @@ current = burstcnt; while (current < expected) { /* Read updated burst count and check status */ - if (cr50_i2c_wait_burststs(mask, &burstcnt, &status) < 0) + if (cr50_i2c_wait_burststs(mask, &burstcnt, &status)) goto out_err;
len = MIN(burstcnt, expected - current); @@ -304,7 +317,7 @@ }
/* Ensure TPM is done reading data */ - if (cr50_i2c_wait_burststs(TPM_STS_VALID, &burstcnt, &status) < 0) + if (cr50_i2c_wait_burststs(TPM_STS_VALID, &burstcnt, &status)) goto out_err; if (status & TPM_STS_DATA_AVAIL) { printk(BIOS_ERR, "%s: Data still available\n", __func__); @@ -334,7 +347,7 @@ if (stopwatch_expired(&sw)) { printk(BIOS_ERR, "%s: Command ready timeout\n", __func__); - return -1; + return TPM_FAIL; }
cr50_i2c_tis_ready(); @@ -348,7 +361,7 @@ mask |= TPM_STS_DATA_EXPECT;
/* Read burst count and check status */ - if (cr50_i2c_wait_burststs(mask, &burstcnt, &status) < 0) + if (cr50_i2c_wait_burststs(mask, &burstcnt, &status)) goto out_err;
/* Use burstcnt - 1 to account for the address byte @@ -364,7 +377,7 @@ }
/* Ensure TPM is not expecting more data */ - if (cr50_i2c_wait_burststs(TPM_STS_VALID, &burstcnt, &status) < 0) + if (cr50_i2c_wait_burststs(TPM_STS_VALID, &burstcnt, &status)) goto out_err; if (status & TPM_STS_DATA_EXPECT) { printk(BIOS_ERR, "%s: Data still expected\n", __func__); @@ -372,7 +385,7 @@ }
/* Start the TPM command */ - if (cr50_i2c_write(TPM_STS(tpm_dev.locality), tpm_go, sizeof(tpm_go)) < 0) { + if (cr50_i2c_write(TPM_STS(tpm_dev.locality), tpm_go, sizeof(tpm_go)) != TPM_SUCCESS) { printk(BIOS_ERR, "%s: Start command failed\n", __func__); goto out_err; } @@ -396,14 +409,15 @@ chip->cancel = &cr50_i2c_tis_ready; }
-int tpm_vendor_probe(unsigned int bus, uint32_t addr) +TPM_RESULT tpm_vendor_probe(unsigned int bus, uint32_t addr) { - return 0; + return TPM_SUCCESS; }
-static int cr50_i2c_probe(uint32_t *did_vid) +static TPM_RESULT cr50_i2c_probe(uint32_t *did_vid) { int retries; + TPM_RESULT rc = 0;
/* * 1s should be enough to synchronize with the TPM even under the @@ -414,14 +428,13 @@ printk(BIOS_INFO, "Probing TPM I2C: ");
for (retries = 100; retries > 0; retries--) { - int rc;
rc = cr50_i2c_read(TPM_DID_VID(0), (uint8_t *)did_vid, 4);
/* Exit once DID and VID verified */ if (!rc && (*did_vid == CR50_DID_VID || *did_vid == TI50_DID_VID)) { printk(BIOS_INFO, "done! DID_VID 0x%08x\n", *did_vid); - return 0; + return TPM_SUCCESS; }
/* TPM might be resetting, let's retry in a bit. */ @@ -432,17 +445,20 @@ /* * I2C reads failed, or the DID and VID didn't match */ - printk(BIOS_ERR, "DID_VID 0x%08x not recognized\n", *did_vid); - return -1; + if (!rc) { + printk(BIOS_ERR, "DID_VID 0x%08x not recognized\n", *did_vid); + return TPM_FAIL; + } + return rc; }
-int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr) +TPM_RESULT tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr) { uint32_t did_vid = 0;
if (dev_addr == 0) { printk(BIOS_ERR, "%s: missing device address\n", __func__); - return -1; + return TPM_FAIL; }
tpm_dev.bus = bus; @@ -470,7 +486,7 @@ }
chip->is_open = 1; - return 0; + return TPM_SUCCESS; }
enum cb_err tis_vendor_write(unsigned int addr, const void *buffer, size_t bytes) diff --git a/src/drivers/i2c/tpm/tis.c b/src/drivers/i2c/tpm/tis.c index e9bf2cf..f37458a 100644 --- a/src/drivers/i2c/tpm/tis.c +++ b/src/drivers/i2c/tpm/tis.c @@ -19,18 +19,18 @@ #define TPM_CMD_COUNT_BYTE 2 #define TPM_CMD_ORDINAL_BYTE 6
-int tis_open(void) +TPM_RESULT tis_open(void) { - int rc; + TPM_RESULT rc;
if (chip.is_open) { printk(BIOS_DEBUG, "%s() called twice.\n", __func__); - return -1; + return TPM_FAIL; }
rc = tpm_vendor_init(&chip, CONFIG_DRIVER_TPM_I2C_BUS, CONFIG_DRIVER_TPM_I2C_ADDR); - if (rc < 0) + if (rc != TPM_SUCCESS) chip.is_open = 0;
if (rc) @@ -39,7 +39,7 @@ return 0; }
-int tis_init(void) +TPM_RESULT tis_init(void) { return tpm_vendor_probe(CONFIG_DRIVER_TPM_I2C_BUS, CONFIG_DRIVER_TPM_I2C_ADDR); @@ -48,28 +48,29 @@ static ssize_t tpm_transmit(const uint8_t *sbuf, size_t sbufsiz, void *rbuf, size_t rbufsiz) { - int rc; + int rc = -1; + TPM_RESULT tpm_rc; uint32_t count;
memcpy(&count, sbuf + TPM_CMD_COUNT_BYTE, sizeof(count)); count = be32_to_cpu(count);
if (!chip.send || !chip.status || !chip.cancel) - return -1; + goto out;
if (count == 0) { printk(BIOS_DEBUG, "%s: no data\n", __func__); - return -1; + goto out; } if (count > sbufsiz) { printk(BIOS_DEBUG, "%s: invalid count value %x %zx\n", __func__, count, sbufsiz); - return -1; + goto out; }
ASSERT(chip.send); - rc = chip.send((uint8_t *)sbuf, count); - if (rc < 0) { + tpm_rc = chip.send((uint8_t *)sbuf, count); + if (tpm_rc != TPM_SUCCESS) { printk(BIOS_DEBUG, "%s: tpm_send error\n", __func__); goto out; } @@ -85,7 +86,6 @@ if (status == chip.req_canceled) { printk(BIOS_DEBUG, "%s: Operation Canceled\n", __func__); - rc = -1; goto out; } mdelay(TPM_TIMEOUT); @@ -95,19 +95,19 @@ ASSERT(chip.cancel); chip.cancel(); printk(BIOS_DEBUG, "%s: Operation Timed out\n", __func__); - rc = -1; //ETIME; goto out;
out_recv: - - rc = chip.recv((uint8_t *)rbuf, rbufsiz); - if (rc < 0) + tpm_rc = chip.recv((uint8_t *)rbuf, rbufsiz); + if (tpm_rc == TPM_SUCCESS) + rc = 0; + else printk(BIOS_DEBUG, "%s: tpm_recv: error %d\n", __func__, rc); out: return rc; }
-int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, +TPM_RESULT tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, uint8_t *recvbuf, size_t *rbuf_len) { ASSERT(sbuf_size >= 10); @@ -124,12 +124,12 @@
if (len < 10) { *rbuf_len = 0; - return -1; + return TPM_FAIL; }
if (len > *rbuf_len) { *rbuf_len = len; - return -1; + return TPM_FAIL; }
*rbuf_len = len; @@ -142,5 +142,5 @@ hexdump(recvbuf, *rbuf_len); }
- return 0; + return TPM_SUCCESS; } diff --git a/src/drivers/i2c/tpm/tis_atmel.c b/src/drivers/i2c/tpm/tis_atmel.c index 669ac68..e8126f0 100644 --- a/src/drivers/i2c/tpm/tis_atmel.c +++ b/src/drivers/i2c/tpm/tis_atmel.c @@ -22,17 +22,17 @@ uint32_t return_code; } __packed;
-int tis_open(void) +TPM_RESULT tis_open(void) { - return 0; + return TPM_SUCCESS; }
-int tis_init(void) +TPM_RESULT tis_init(void) { - return 0; + return TPM_SUCCESS; }
-int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, +TPM_RESULT tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, uint8_t *recvbuf, size_t *rbuf_len) { size_t hdr_bytes; @@ -61,7 +61,8 @@ if ((status < 0) && (!stopwatch_expired(&sw))) continue; if (status < 0) - return status; + printk(BIOS_ERR, "I2C write error: %d\n", status); + return TPM_COMMUNICATION_ERROR; break; }
@@ -79,7 +80,7 @@ udelay(SLEEP_DURATION); } while (!stopwatch_expired(&sw)); if (status != sizeof(*header)) - return -1; + return TPM_COMMUNICATION_ERROR;
/* Determine the number of bytes remaining */ recv_bytes = MIN(be32_to_cpu(*(uint32_t *)&header->length), @@ -94,8 +95,10 @@ /* Read the full TPM response */ status = i2c_read_raw(CONFIG_DRIVER_TPM_I2C_BUS, CONFIG_DRIVER_TPM_I2C_ADDR, recvbuf, recv_bytes); - if (status < 0) - return status; + if (status < 0) { + printk(BIOS_ERR, "I2C read error: %d\n", status); + return TPM_COMMUNICATION_ERROR; + } }
/* Return the number of bytes received */ @@ -110,5 +113,5 @@ }
/* Successful transfer */ - return 0; + return TPM_SUCCESS; } diff --git a/src/drivers/i2c/tpm/tpm.h b/src/drivers/i2c/tpm/tpm.h index d4176cc..b0a342f 100644 --- a/src/drivers/i2c/tpm/tpm.h +++ b/src/drivers/i2c/tpm/tpm.h @@ -12,6 +12,7 @@ #ifndef __DRIVERS_TPM_SLB9635_I2C_TPM_H__ #define __DRIVERS_TPM_SLB9635_I2C_TPM_H__
+#include <security/tpm/tss/common/tss_common.h> #include <stdint.h>
enum tpm_timeout { @@ -51,8 +52,8 @@
/* ---------- Interface for TPM vendor ------------ */
-int tpm_vendor_probe(unsigned int bus, uint32_t addr); +TPM_RESULT tpm_vendor_probe(unsigned int bus, uint32_t addr);
-int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr); +TPM_RESULT tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr);
#endif /* __DRIVERS_TPM_SLB9635_I2C_TPM_H__ */ diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c index ed9c8d0..7a681c9 100644 --- a/src/drivers/pc80/tpm/tis.c +++ b/src/drivers/pc80/tpm/tis.c @@ -74,17 +74,6 @@ #define TIS_ACCESS_REQUEST_USE (1 << 1) /* 0x02 */ #define TIS_ACCESS_TPM_ESTABLISHMENT (1 << 0) /* 0x01 */
-/* - * Error value returned if a tpm register does not enter the expected state - * after continuous polling. No actual TPM register reading ever returns ~0, - * so this value is a safe error indication to be mixed with possible status - * register values. - */ -#define TPM_TIMEOUT_ERR (~0) - -/* Error value returned on various TPM driver errors */ -#define TPM_DRIVER_ERR (~0) - /* 1 second is plenty for anything TPM does.*/ #define MAX_DELAY_US USECS_PER_SEC
@@ -248,9 +237,9 @@ * @mask - bitmask for the bitfield(s) to watch * @expected - value the field(s) are supposed to be set to * - * Returns 0 on success or TPM_TIMEOUT_ERR on timeout. + * Returns 0 on success or TPM_RETRY on timeout. */ -static int tis_wait_sts(int locality, u8 mask, u8 expected) +static TPM_RESULT tis_wait_sts(int locality, u8 mask, u8 expected) { struct stopwatch sw;
@@ -258,24 +247,24 @@ do { u8 value = tpm_read_status(locality); if ((value & mask) == expected) - return 0; + return TPM_SUCCESS; udelay(1); } while (!stopwatch_expired(&sw)); - return TPM_TIMEOUT_ERR; + return TPM_RETRY; }
-static inline int tis_wait_ready(int locality) +static inline TPM_RESULT tis_wait_ready(int locality) { return tis_wait_sts(locality, TIS_STS_COMMAND_READY, TIS_STS_COMMAND_READY); }
-static inline int tis_wait_valid(int locality) +static inline TPM_RESULT tis_wait_valid(int locality) { return tis_wait_sts(locality, TIS_STS_VALID, TIS_STS_VALID); }
-static inline int tis_wait_valid_data(int locality) +static inline TPM_RESULT tis_wait_valid_data(int locality) { const u8 has_data = TIS_STS_DATA_AVAILABLE | TIS_STS_VALID; return tis_wait_sts(locality, has_data, has_data); @@ -302,9 +291,9 @@ * @mask - bitmask for the bitfield(s) to watch * @expected - value the field(s) are supposed to be set to * - * Returns 0 on success or TPM_TIMEOUT_ERR on timeout. + * Returns 0 on success or TPM_RETRY on timeout. */ -static int tis_wait_access(int locality, u8 mask, u8 expected) +static TPM_RESULT tis_wait_access(int locality, u8 mask, u8 expected) { struct stopwatch sw;
@@ -312,13 +301,13 @@ do { u8 value = tpm_read_access(locality); if ((value & mask) == expected) - return 0; + return TPM_SUCCESS; udelay(1); } while (!stopwatch_expired(&sw)); - return TPM_TIMEOUT_ERR; + return TPM_RETRY; }
-static inline int tis_wait_received_access(int locality) +static inline TPM_RESULT tis_wait_received_access(int locality) { return tis_wait_access(locality, TIS_ACCESS_ACTIVE_LOCALITY, TIS_ACCESS_ACTIVE_LOCALITY); @@ -346,9 +335,9 @@ * flexible when trying to set command ready. * * Returns 0 on success if the TPM is ready for transactions. - * Returns TPM_TIMEOUT_ERR if the command ready bit does not get set. + * Returns TPM_RETRY if the command ready bit does not get set. */ -static int tis_command_ready(u8 locality) +static TPM_RESULT tis_command_ready(u8 locality) { u32 status;
@@ -360,7 +349,7 @@
/* Check if command ready is set yet */ if (status & TIS_STS_COMMAND_READY) - return 0; + return TPM_SUCCESS;
/* 2nd attempt to set command ready */ tpm_write_status(TIS_STS_COMMAND_READY, locality); @@ -372,9 +361,9 @@ * Probe the TPM device and try determining its manufacturer/device name. * * 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. + * invocation) or TPM_FAIL if the device is not found. */ -static u32 tis_probe(void) +static TPM_RESULT tis_probe(void) { const char *device_name = "unknown"; const char *vendor_name = device_name; @@ -384,12 +373,12 @@ int i;
if (vendor_dev_id) - return 0; /* Already probed. */ + return TPM_SUCCESS; /* Already probed. */
didvid = tpm_read_did_vid(0); if (!didvid || (didvid == 0xffffffff)) { printf("%s: No TPM device found\n", __func__); - return TPM_DRIVER_ERR; + return TPM_FAIL; }
vendor_dev_id = didvid; @@ -417,7 +406,7 @@ } /* this will have to be converted into debug printout */ printk(BIOS_INFO, "Found TPM %s by %s\n", device_name, vendor_name); - return 0; + return TPM_SUCCESS; }
/* @@ -428,10 +417,10 @@ * @data - address of the data to send, byte by byte * @len - length of the data to send * - * Returns 0 on success, TPM_DRIVER_ERR on error (in case the device does + * Returns 0 on success, TPM_FAIL on error (in case the device does * not accept the entire command). */ -static u32 tis_senddata(const u8 *const data, u32 len) +static TPM_RESULT tis_senddata(const u8 *const data, u32 len) { u32 offset = 0; u16 burst = 0; @@ -440,7 +429,7 @@ if (tis_wait_ready(locality)) { printf("%s:%d - failed to get 'command_ready' status\n", __FILE__, __LINE__); - return TPM_DRIVER_ERR; + return TPM_FAIL; } burst = tpm_read_burst_count(locality);
@@ -454,7 +443,7 @@ if (stopwatch_expired(&sw)) { printf("%s:%d failed to feed %u bytes of %u\n", __FILE__, __LINE__, len - offset, len); - return TPM_DRIVER_ERR; + return TPM_FAIL; } udelay(1); burst = tpm_read_burst_count(locality); @@ -476,7 +465,7 @@ if (tis_wait_valid(locality) || !tis_expect_data(locality)) { printf("%s:%d TPM command feed overflow\n", __FILE__, __LINE__); - return TPM_DRIVER_ERR; + return TPM_FAIL; }
burst = tpm_read_burst_count(locality); @@ -499,13 +488,13 @@ if (tis_wait_valid(locality) || tis_expect_data(locality)) { printf("%s:%d unexpected TPM status 0x%x\n", __FILE__, __LINE__, tpm_read_status(locality)); - return TPM_DRIVER_ERR; + return TPM_FAIL; }
/* OK, sitting pretty, let's start the command execution. */ tpm_write_status(TIS_STS_TPM_GO, locality);
- return 0; + return TPM_SUCCESS; }
/* @@ -518,9 +507,9 @@ * * On success stores the number of received bytes to len and returns 0. On * errors (misformatted TPM data or synchronization problems) returns - * TPM_DRIVER_ERR. + * TPM_FAIL. */ -static u32 tis_readresponse(u8 *buffer, size_t *len) +static TPM_RESULT tis_readresponse(u8 *buffer, size_t *len) { u16 burst_count; u32 offset = 0; @@ -531,7 +520,7 @@ /* Wait for the TPM to process the command */ if (tis_wait_valid_data(locality)) { printf("%s:%d failed processing command\n", __FILE__, __LINE__); - return TPM_DRIVER_ERR; + return TPM_FAIL; }
do { @@ -539,7 +528,7 @@ if (max_cycles++ == MAX_DELAY_US) { printf("%s:%d TPM stuck on read\n", __FILE__, __LINE__); - return TPM_DRIVER_ERR; + return TPM_FAIL; } udelay(1); } @@ -567,7 +556,7 @@ printf("%s:%d bad response size %u\n", __FILE__, __LINE__, expected_count); - return TPM_DRIVER_ERR; + return TPM_FAIL; } } } @@ -576,7 +565,7 @@ if (tis_wait_valid(locality)) { printf("%s:%d failed to read response\n", __FILE__, __LINE__); - return TPM_DRIVER_ERR; + return TPM_FAIL; }
if (offset == expected_count) @@ -597,28 +586,28 @@ printf("%s:%d wrong receive status: %x %u bytes left\n", __FILE__, __LINE__, tpm_read_status(locality), tpm_read_burst_count(locality)); - return TPM_DRIVER_ERR; + return TPM_FAIL; }
/* Tell the TPM that we are done. */ - if (tis_command_ready(locality) == TPM_TIMEOUT_ERR) - return TPM_DRIVER_ERR; + if (tis_command_ready(locality) == TPM_RETRY) + return TPM_FAIL;
*len = offset; - return 0; + return TPM_SUCCESS; }
/* * tis_init() * - * Initialize the TPM device. Returns 0 on success or TPM_DRIVER_ERR on + * Initialize the TPM device. Returns 0 on success or TPM_FAIL on * failure (in case device probing did not succeed). */ -int tis_init(void) +TPM_RESULT tis_init(void) { if (tis_probe()) - return TPM_DRIVER_ERR; - return 0; + return TPM_FAIL; + return TPM_SUCCESS; }
/* @@ -626,9 +615,9 @@ * * Requests access to locality 0 for the caller. * - * Returns 0 on success, TPM_DRIVER_ERR on failure. + * Returns TPM_SUCCESS on success, TSS Error on failure. */ -int tis_open(void) +TPM_RESULT tis_open(void) { u8 locality = 0; /* we use locality zero for everything */
@@ -640,17 +629,17 @@ if (tis_wait_received_access(locality)) { printf("%s:%d - failed to lock locality %u\n", __FILE__, __LINE__, locality); - return TPM_DRIVER_ERR; + return TPM_FAIL; }
/* Certain TPMs seem to need some delay here or they hang... */ udelay(10); }
- if (tis_command_ready(locality) == TPM_TIMEOUT_ERR) - return TPM_DRIVER_ERR; + if (tis_command_ready(locality) == TPM_RETRY) + return TPM_FAIL;
- return 0; + return TPM_SUCCESS; }
/* @@ -664,15 +653,15 @@ * @recv_len - pointer to the size of the response buffer * * Returns 0 on success (and places the number of response bytes at recv_len) - * or TPM_DRIVER_ERR on failure. + * or TPM_FAIL on failure. */ -int tis_sendrecv(const uint8_t *sendbuf, size_t send_size, +TPM_RESULT 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", __FILE__, __LINE__); - return TPM_DRIVER_ERR; + return TPM_FAIL; }
return tis_readresponse(recvbuf, recv_len); @@ -691,14 +680,14 @@ * @vector - TPM interrupt vector * @polarity - TPM interrupt polarity * - * Returns 0 on success, TPM_DRIVER_ERR on failure. + * Returns 0 on success, TPM_FAIL on failure. */ -static int tis_setup_interrupt(int vector, int polarity) +static TPM_RESULT tis_setup_interrupt(int vector, int polarity) { u8 locality = 0;
if (tlcl_lib_init()) - return TPM_DRIVER_ERR; + return TPM_FAIL;
/* Set TPM interrupt vector */ tpm_write_int_vector(vector, locality); @@ -706,7 +695,7 @@ /* Set TPM interrupt polarity and disable interrupts */ tpm_write_int_polarity(polarity, locality);
- return 0; + return TPM_SUCCESS; }
static void lpc_tpm_read_resources(struct device *dev) diff --git a/src/drivers/spi/tpm/tis.c b/src/drivers/spi/tpm/tis.c index b9b2a4a..50585b6 100644 --- a/src/drivers/spi/tpm/tis.c +++ b/src/drivers/spi/tpm/tis.c @@ -29,16 +29,16 @@ return "Unknown"; }
-int tis_open(void) +TPM_RESULT tis_open(void) { if (tpm_is_open) { printk(BIOS_ERR, "%s() called twice.\n", __func__); - return -1; + return TPM_FAIL; } - return 0; + return TPM_SUCCESS; }
-int tis_init(void) +TPM_RESULT tis_init(void) { struct spi_slave spi; struct tpm2_info info; @@ -46,12 +46,12 @@ 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 -1; + return TPM_FAIL; }
if (tpm2_init(&spi)) { printk(BIOS_ERR, "Failed to initialize TPM SPI interface\n"); - return -1; + return TPM_FAIL; }
tpm2_get_info(&info); @@ -59,18 +59,18 @@ printk(BIOS_INFO, "Initialized TPM device %s revision %d\n", tis_get_dev_name(&info), info.revision);
- return 0; + return TPM_SUCCESS; }
-int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, +TPM_RESULT 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; + return TPM_FAIL;
*rbuf_len = len;
- return 0; + return TPM_SUCCESS; } diff --git a/src/drivers/spi/tpm/tpm.c b/src/drivers/spi/tpm/tpm.c index 898d570..5efc520 100644 --- a/src/drivers/spi/tpm/tpm.c +++ b/src/drivers/spi/tpm/tpm.c @@ -394,7 +394,7 @@ 0x0000104a /* ST33HTPH2E32 */ };
-int tpm2_init(struct spi_slave *spi_if) +TPM_RESULT tpm2_init(struct spi_slave *spi_if) { uint32_t did_vid, status, intf_id; uint8_t cmd; @@ -433,7 +433,7 @@ if (!retries) { printk(BIOS_ERR, "\n%s: Failed to connect to the TPM\n", __func__); - return -1; + return TPM_FAIL; }
printk(BIOS_INFO, " done!\n"); @@ -444,11 +444,11 @@ if (tpm2_read_reg(TPM_INTF_ID_REG, &intf_id, sizeof(intf_id)) != CB_SUCCESS) { printk(BIOS_ERR, "\n%s: Failed to read interface ID register\n", __func__); - return -1; + return TPM_FAIL; } if ((be32toh(intf_id) & 0xF) == 0xF) { printk(BIOS_DEBUG, "\n%s: Not a TPM2 device\n", __func__); - return -1; + return TPM_FAIL; } }
@@ -459,16 +459,16 @@ * initialization after reset. */ if (tpm2_claim_locality() != CB_SUCCESS) - return -1; + return TPM_FAIL;
if (read_tpm_sts(&status) != CB_SUCCESS) { printk(BIOS_ERR, "Reading status reg failed\n"); - return -1; + return TPM_FAIL; } if ((status & TPM_STS_FAMILY_MASK) != TPM_STS_FAMILY_TPM_2_0) { printk(BIOS_ERR, "unexpected TPM family value, status: %#x\n", status); - return -1; + return TPM_FAIL; }
/* @@ -492,7 +492,7 @@ cr50_set_board_cfg(); } } - return 0; + return TPM_SUCCESS; }
/* diff --git a/src/mainboard/facebook/fbg1701/romstage.c b/src/mainboard/facebook/fbg1701/romstage.c index 38d8053..8df4357 100644 --- a/src/mainboard/facebook/fbg1701/romstage.c +++ b/src/mainboard/facebook/fbg1701/romstage.c @@ -7,6 +7,7 @@ #if CONFIG(VENDORCODE_ELTAN_MBOOT) #include <mboot.h> #endif +#include <security/tpm/tss/common/tss_common.h> #include <soc/lpc.h> #include <soc/pci_devs.h> #include <soc/romstage.h> @@ -71,9 +72,9 @@ CONFIG_VENDORCODE_ELTAN_CRTM_VERSION_STRING COREBOOT_VERSION COREBOOT_EXTRA_VERSION " " COREBOOT_BUILD;
-int mb_crtm(void) +TPM_RESULT mb_crtm(void) { - int status = TPM_IOERROR; + TPM_RESULT status = TPM_IOERROR; TCG_PCR_EVENT2_HDR tcgEventHdr;
/* Use FirmwareVersion string to represent CRTM version. */ diff --git a/src/mainboard/google/brya/mainboard.c b/src/mainboard/google/brya/mainboard.c index a460337..fa66d9f 100644 --- a/src/mainboard/google/brya/mainboard.c +++ b/src/mainboard/google/brya/mainboard.c @@ -34,10 +34,10 @@
void mainboard_update_soc_chip_config(struct soc_intel_alderlake_config *config) { - int rc; + TPM_RESULT rc;
rc = tlcl_lib_init(); - if (rc != VB2_SUCCESS) { + if (rc != TPM_SUCCESS) { printk(BIOS_ERR, "tlcl_lib_init() failed: 0x%x\n", rc); return; } diff --git a/src/mainboard/google/dedede/mainboard.c b/src/mainboard/google/dedede/mainboard.c index 444eef8..dadc8ec 100644 --- a/src/mainboard/google/dedede/mainboard.c +++ b/src/mainboard/google/dedede/mainboard.c @@ -14,10 +14,10 @@ static void mainboard_update_soc_chip_config(void) { struct soc_intel_jasperlake_config *cfg = config_of_soc(); - int rc; + TPM_RESULT rc;
rc = tlcl_lib_init(); - if (rc != VB2_SUCCESS) { + if (rc != TPM_SUCCESS) { printk(BIOS_ERR, "tlcl_lib_init() failed: 0x%x\n", rc); return; } diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c index 7409a5b..fb05c59 100644 --- a/src/mainboard/google/volteer/mainboard.c +++ b/src/mainboard/google/volteer/mainboard.c @@ -82,7 +82,7 @@
void mainboard_update_soc_chip_config(struct soc_intel_tigerlake_config *cfg) { - int rc; + TPM_RESULT rc; if (!CONFIG(TPM_GOOGLE_CR50) || !CONFIG(SPI_TPM)) { /* * Negotiation of long interrupt pulses is only supported via SPI. I2C is only @@ -94,7 +94,7 @@ }
rc = tlcl_lib_init(); - if (rc != VB2_SUCCESS) { + if (rc != TPM_SUCCESS) { printk(BIOS_ERR, "tlcl_lib_init() failed: 0x%x\n", rc); return; } diff --git a/src/security/tpm/tis.h b/src/security/tpm/tis.h index fae049e..06ec3a8 100644 --- a/src/security/tpm/tis.h +++ b/src/security/tpm/tis.h @@ -3,6 +3,7 @@ #ifndef TIS_H_ #define TIS_H_
+#include <security/tpm/tss/common/tss_common.h> #include <types.h>
enum tis_access { @@ -34,19 +35,19 @@ /* * tis_init() * - * Initialize the TPM device. Returns 0 on success or -1 on - * failure (in case device probing did not succeed). + * Initialize the TPM device. + * Returns TSS Return Code from TCG TPM Structures. See tss_errors.h */ -int tis_init(void); +TPM_RESULT tis_init(void);
/* * tis_open() * * Requests access to locality 0 for the caller. * - * Returns 0 on success, -1 on failure. + * Returns TSS Return Code from TCG TPM Structures. See tss_errors.h */ -int tis_open(void); +TPM_RESULT tis_open(void);
/* * tis_sendrecv() @@ -58,10 +59,9 @@ * @recvbuf - memory to save the response to * @recv_len - pointer to the size of the response buffer * - * Returns 0 on success (and places the number of response bytes at recv_len) - * or -1 on failure. + * Returns TSS Return Code from TCG TPM Structures. See tss_errors.h */ -int tis_sendrecv(const u8 *sendbuf, size_t send_size, u8 *recvbuf, +TPM_RESULT tis_sendrecv(const u8 *sendbuf, size_t send_size, u8 *recvbuf, size_t *recv_len);
/* diff --git a/src/security/tpm/tspi.h b/src/security/tpm/tspi.h index 33f363c..8281178 100644 --- a/src/security/tpm/tspi.h +++ b/src/security/tpm/tspi.h @@ -137,7 +137,7 @@ * @param name sets additional info where the digest comes from * @return TPM_SUCCESS on success. If not a tpm error is returned */ -uint32_t tpm_extend_pcr(int pcr, enum vb2_hash_algorithm digest_algo, +TPM_RESULT tpm_extend_pcr(int pcr, enum vb2_hash_algorithm digest_algo, const uint8_t *digest, size_t digest_len, const char *name);
@@ -145,14 +145,14 @@ * Issue a TPM_Clear and re-enable/reactivate the TPM. * @return TPM_SUCCESS on success. If not a tpm error is returned */ -uint32_t tpm_clear_and_reenable(void); +TPM_RESULT tpm_clear_and_reenable(void);
/** * Start the TPM and establish the root of trust. * @param s3flag tells the tpm setup if we wake up from a s3 state on x86 * @return TPM_SUCCESS on success. If not a tpm error is returned */ -uint32_t tpm_setup(int s3flag); +TPM_RESULT tpm_setup(int s3flag);
/** * Measure a given region device and extend given PCR with the result. @@ -161,7 +161,7 @@ * @param *rname Name of the region that is measured * @return TPM error code in case of error otherwise TPM_SUCCESS */ -uint32_t tpm_measure_region(const struct region_device *rdev, uint8_t pcr, +TPM_RESULT tpm_measure_region(const struct region_device *rdev, uint8_t pcr, const char *rname);
#endif /* TSPI_H_ */ diff --git a/src/security/tpm/tspi/crtm.c b/src/security/tpm/tspi/crtm.c index 4f29ad1..74ad508 100644 --- a/src/security/tpm/tspi/crtm.c +++ b/src/security/tpm/tspi/crtm.c @@ -31,9 +31,9 @@ * stage. * * Takes the current vboot context as parameter for s3 checks. - * returns on success VB2_SUCCESS, else a vboot error. + * returns on success TPM_SUCCESS, else a TPM error. */ -static uint32_t tspi_init_crtm(void) +static TPM_RESULT tspi_init_crtm(void) { /* Initialize TPM PRERAM log. */ if (!tpm_log_available()) { @@ -41,7 +41,7 @@ tpm_log_initialized = 1; } else { printk(BIOS_WARNING, "TSPI: CRTM already initialized!\n"); - return VB2_SUCCESS; + return TPM_SUCCESS; }
struct region_device fmap; @@ -49,7 +49,7 @@ if (tpm_measure_region(&fmap, CONFIG_PCR_SRTM, "FMAP: FMAP")) { printk(BIOS_ERR, "TSPI: Couldn't measure FMAP into CRTM!\n"); - return VB2_ERROR_UNKNOWN; + return TPM_FAIL; } } else { printk(BIOS_ERR, "TSPI: Could not find FMAP!\n"); @@ -62,7 +62,7 @@ if (tpm_measure_region(&bootblock_fmap, CONFIG_PCR_SRTM, "FMAP: BOOTBLOCK")) - return VB2_ERROR_UNKNOWN; + return TPM_FAIL; } } else if (CONFIG(BOOTBLOCK_IN_CBFS)){ /* Mapping measures the file. We know we can safely map here because @@ -72,7 +72,7 @@ if (!mapping) { printk(BIOS_INFO, "TSPI: Couldn't measure bootblock into CRTM!\n"); - return VB2_ERROR_UNKNOWN; + return TPM_FAIL; } cbfs_unmap(mapping); } else { @@ -82,11 +82,11 @@ if (tspi_soc_measure_bootblock(CONFIG_PCR_SRTM)) { printk(BIOS_INFO, "TSPI: Couldn't measure bootblock into CRTM on SoC level!\n"); - return VB2_ERROR_UNKNOWN; + return TPM_FAIL; } }
- return VB2_SUCCESS; + return TPM_SUCCESS; }
static bool is_runtime_data(const char *name) @@ -108,16 +108,16 @@ return !strcmp(allowlist, name); }
-uint32_t tspi_cbfs_measurement(const char *name, uint32_t type, const struct vb2_hash *hash) +TPM_RESULT tspi_cbfs_measurement(const char *name, uint32_t type, const struct vb2_hash *hash) { uint32_t pcr_index; char tpm_log_metadata[TPM_CB_LOG_PCR_HASH_NAME];
if (!tpm_log_available()) { - if (tspi_init_crtm() != VB2_SUCCESS) { + if (tspi_init_crtm()) { printk(BIOS_WARNING, "Initializing CRTM failed!\n"); - return 0; + return TPM_FAIL; } printk(BIOS_DEBUG, "CRTM initialized.\n"); } @@ -171,7 +171,7 @@ return tclt; }
-int tspi_measure_cache_to_pcr(void) +TPM_RESULT tspi_measure_cache_to_pcr(void) { int i; int pcr; @@ -181,27 +181,27 @@
/* This means the table is empty. */ if (!tpm_log_available()) - return VB2_SUCCESS; + return TPM_SUCCESS;
if (tpm_log_init() == NULL) { printk(BIOS_WARNING, "TPM LOG: log non-existent!\n"); - return VB2_ERROR_UNKNOWN; + return TPM_FAIL; }
printk(BIOS_DEBUG, "TPM: Write digests cached in TPM log to PCR\n"); i = 0; while (!tpm_log_get(i++, &pcr, &digest_data, &digest_algo, &event_name)) { printk(BIOS_DEBUG, "TPM: Write digest for %s into PCR %d\n", event_name, pcr); - int rc = tlcl_extend(pcr, digest_data, digest_algo); + TPM_RESULT rc = tlcl_extend(pcr, digest_data, digest_algo); if (rc != TPM_SUCCESS) { printk(BIOS_ERR, "TPM: Writing digest of %s into PCR failed with error %d\n", event_name, rc); - return VB2_ERROR_UNKNOWN; + return TPM_FAIL; } }
- return VB2_SUCCESS; + return TPM_SUCCESS; }
#if !CONFIG(VBOOT_RETURN_FROM_VERSTAGE) diff --git a/src/security/tpm/tspi/crtm.h b/src/security/tpm/tspi/crtm.h index 2bc1d1f..293db63 100644 --- a/src/security/tpm/tspi/crtm.h +++ b/src/security/tpm/tspi/crtm.h @@ -5,6 +5,7 @@
#include <program_loading.h> #include <security/tpm/tspi.h> +#include <security/tpm/tss/common/tss_common.h> #include <types.h> #include <vb2_sha.h>
@@ -40,12 +41,12 @@ /** * Measure digests cached in TPM log entries into PCRs */ -int tspi_measure_cache_to_pcr(void); +TPM_RESULT tspi_measure_cache_to_pcr(void);
/** * Extend a measurement hash taken for a CBFS file into the appropriate PCR. */ -uint32_t tspi_cbfs_measurement(const char *name, uint32_t type, const struct vb2_hash *hash); +TPM_RESULT tspi_cbfs_measurement(const char *name, uint32_t type, const struct vb2_hash *hash);
/* * Provide a function on SoC level to measure the bootblock for cases where bootblock is diff --git a/src/security/tpm/tspi/tspi.c b/src/security/tpm/tspi/tspi.c index 0088913..acc9a2d 100644 --- a/src/security/tpm/tspi/tspi.c +++ b/src/security/tpm/tspi/tspi.c @@ -11,11 +11,11 @@ #include <vb2_sha.h>
#if CONFIG(TPM1) -static uint32_t tpm1_invoke_state_machine(void) +static TPM_RESULT tpm1_invoke_state_machine(void) { uint8_t disabled; uint8_t deactivated; - uint32_t rc = TPM_SUCCESS; + TPM_RESULT rc = TPM_SUCCESS;
/* Check that the TPM is enabled and activated. */ rc = tlcl_get_flags(&disabled, &deactivated, NULL); @@ -52,11 +52,9 @@ } #endif
-static uint32_t tpm_setup_s3_helper(void) +static TPM_RESULT tpm_setup_s3_helper(void) { - uint32_t rc; - - rc = tlcl_resume(); + TPM_RESULT rc = tlcl_resume(); switch (rc) { case TPM_SUCCESS: break; @@ -78,7 +76,7 @@ return rc; }
-static uint32_t tpm_setup_epilogue(uint32_t rc) +static TPM_RESULT tpm_setup_epilogue(uint32_t rc) { if (rc != TPM_SUCCESS) post_code(POST_TPM_FAILURE); @@ -133,9 +131,9 @@ * to the TPM flashram at every reboot or wake-up, because of concerns about * the durability of the NVRAM. */ -uint32_t tpm_setup(int s3flag) +TPM_RESULT tpm_setup(int s3flag) { - uint32_t rc; + TPM_RESULT rc;
rc = tlcl_lib_init(); if (rc != TPM_SUCCESS) { @@ -190,9 +188,9 @@ return tpm_setup_epilogue(rc); }
-uint32_t tpm_clear_and_reenable(void) +TPM_RESULT tpm_clear_and_reenable(void) { - uint32_t rc; + TPM_RESULT rc;
printk(BIOS_INFO, "TPM: Clear and re-enable\n"); rc = tlcl_force_clear(); @@ -218,10 +216,10 @@ return TPM_SUCCESS; }
-uint32_t tpm_extend_pcr(int pcr, enum vb2_hash_algorithm digest_algo, +TPM_RESULT tpm_extend_pcr(int pcr, enum vb2_hash_algorithm digest_algo, const uint8_t *digest, size_t digest_len, const char *name) { - uint32_t rc; + TPM_RESULT rc;
if (!digest) return TPM_IOERROR; @@ -252,7 +250,7 @@ }
#if CONFIG(VBOOT_LIB) -uint32_t tpm_measure_region(const struct region_device *rdev, uint8_t pcr, +TPM_RESULT tpm_measure_region(const struct region_device *rdev, uint8_t pcr, const char *rname) { uint8_t digest[TPM_PCR_MAX_LEN], digest_len; diff --git a/src/security/tpm/tss.h b/src/security/tpm/tss.h index a85503d..cb1016e 100644 --- a/src/security/tpm/tss.h +++ b/src/security/tpm/tss.h @@ -24,29 +24,29 @@ * Define a space with permission [perm]. [index] is the index for the space, * [size] the usable data size. The TPM error code is returned. */ -uint32_t tlcl_define_space(uint32_t index, uint32_t perm, uint32_t size); +TPM_RESULT tlcl_define_space(uint32_t index, uint32_t perm, uint32_t size);
/** * Issue a PhysicalEnable. The TPM error code is returned. */ -uint32_t tlcl_set_enable(void); +TPM_RESULT tlcl_set_enable(void);
/** * Issue a SetDeactivated. Pass 0 to activate. Returns result code. */ -uint32_t tlcl_set_deactivated(uint8_t flag); +TPM_RESULT tlcl_set_deactivated(uint8_t flag);
/** * Get flags of interest. Pointers for flags you aren't interested in may * be NULL. The TPM error code is returned. */ -uint32_t tlcl_get_flags(uint8_t *disable, uint8_t *deactivated, +TPM_RESULT tlcl_get_flags(uint8_t *disable, uint8_t *deactivated, uint8_t *nvlocked);
/** * Get the entire set of permanent flags. */ -uint32_t tlcl_get_permanent_flags(TPM_PERMANENT_FLAGS *pflags); +TPM_RESULT tlcl_get_permanent_flags(TPM_PERMANENT_FLAGS *pflags);
#endif
@@ -58,7 +58,7 @@ * Define a TPM2 space. The define space command TPM command used by the tlcl * layer offers the ability to use custom nv attributes and policies. */ -uint32_t tlcl_define_space(uint32_t space_index, size_t space_size, +TPM_RESULT tlcl_define_space(uint32_t space_index, size_t space_size, const TPMA_NV nv_attributes, const uint8_t *nv_policy, size_t nv_policy_size);
@@ -70,7 +70,7 @@ TPMS_CAPABILITY_DATA *capability_data);
/* Issue TPM2_NV_SetBits command */ -uint32_t tlcl_set_bits(uint32_t index, uint64_t bits); +TPM_RESULT tlcl_set_bits(uint32_t index, uint64_t bits);
/* * Makes tpm_process_command available for on top implementations of @@ -89,12 +89,12 @@ /** * Call this first. Returns 0 if success, nonzero if error. */ -uint32_t tlcl_lib_init(void); +TPM_RESULT tlcl_lib_init(void);
/** * Perform a raw TPM request/response transaction. */ -uint32_t tlcl_send_receive(const uint8_t *request, uint8_t *response, +TPM_RESULT tlcl_send_receive(const uint8_t *request, uint8_t *response, int max_length);
/* Commands */ @@ -103,20 +103,20 @@ * Send a TPM_Startup(ST_CLEAR). The TPM error code is returned (0 for * success). */ -uint32_t tlcl_startup(void); +TPM_RESULT tlcl_startup(void);
/** * Resume by sending a TPM_Startup(ST_STATE). The TPM error code is returned * (0 for success). */ -uint32_t tlcl_resume(void); +TPM_RESULT tlcl_resume(void);
/** * Save TPM state by sending either TPM_SaveState() (TPM1.2) or * TPM_Shutdown(ST_STATE) (TPM2.0). The TPM error code is returned (0 for * success). */ -uint32_t tlcl_save_state(void); +TPM_RESULT tlcl_save_state(void);
/** * Run the self test. @@ -124,81 +124,81 @@ * Note---this is synchronous. To run this in parallel with other firmware, * use ContinueSelfTest(). The TPM error code is returned. */ -uint32_t tlcl_self_test_full(void); +TPM_RESULT tlcl_self_test_full(void);
/** * Run the self test in the background. */ -uint32_t tlcl_continue_self_test(void); +TPM_RESULT tlcl_continue_self_test(void);
/** * Write [length] bytes of [data] to space at [index]. The TPM error code is * returned. */ -uint32_t tlcl_write(uint32_t index, const void *data, uint32_t length); +TPM_RESULT tlcl_write(uint32_t index, const void *data, uint32_t length);
/** * Read [length] bytes from space at [index] into [data]. The TPM error code * is returned. */ -uint32_t tlcl_read(uint32_t index, void *data, uint32_t length); +TPM_RESULT tlcl_read(uint32_t index, void *data, uint32_t length);
/** * Assert physical presence in software. The TPM error code is returned. */ -uint32_t tlcl_assert_physical_presence(void); +TPM_RESULT tlcl_assert_physical_presence(void);
/** * Enable the physical presence command. The TPM error code is returned. */ -uint32_t tlcl_physical_presence_cmd_enable(void); +TPM_RESULT tlcl_physical_presence_cmd_enable(void);
/** * Finalize the physical presence settings: software PP is enabled, hardware PP * is disabled, and the lifetime lock is set. The TPM error code is returned. */ -uint32_t tlcl_finalize_physical_presence(void); +TPM_RESULT tlcl_finalize_physical_presence(void);
/** * Set the nvLocked bit. The TPM error code is returned. */ -uint32_t tlcl_set_nv_locked(void); +TPM_RESULT tlcl_set_nv_locked(void);
/** * Issue a ForceClear. The TPM error code is returned. */ -uint32_t tlcl_force_clear(void); +TPM_RESULT tlcl_force_clear(void);
/** * Set Clear Control. The TPM error code is returned. */ -uint32_t tlcl_clear_control(bool disable); +TPM_RESULT tlcl_clear_control(bool disable);
/** * Set the bGlobalLock flag, which only a reboot can clear. The TPM error * code is returned. */ -uint32_t tlcl_set_global_lock(void); +TPM_RESULT tlcl_set_global_lock(void);
/** * Make an NV Ram location read_only. The TPM error code is returned. */ -uint32_t tlcl_lock_nv_write(uint32_t index); +TPM_RESULT tlcl_lock_nv_write(uint32_t index);
/** * Perform a TPM_Extend. */ -uint32_t tlcl_extend(int pcr_num, const uint8_t *digest_data, +TPM_RESULT tlcl_extend(int pcr_num, const uint8_t *digest_data, enum vb2_hash_algorithm digest_algo);
/** * Disable platform hierarchy. Specific to TPM2. The TPM error code is returned. */ -uint32_t tlcl_disable_platform_hierarchy(void); +TPM_RESULT tlcl_disable_platform_hierarchy(void);
/** * Get the permission bits for the NVRAM space with |index|. */ -uint32_t tlcl_get_permissions(uint32_t index, uint32_t *permissions); +TPM_RESULT tlcl_get_permissions(uint32_t index, uint32_t *permissions);
#endif /* TSS_H_ */ diff --git a/src/security/tpm/tss/common/tss_common.h b/src/security/tpm/tss/common/tss_common.h index 419e429..a125a60 100644 --- a/src/security/tpm/tss/common/tss_common.h +++ b/src/security/tpm/tss/common/tss_common.h @@ -4,6 +4,7 @@ #define TCG_TSS_COMMON_H_
#include <stdint.h> +#include <security/tpm/tss_errors.h>
#define TPM_PCR_MINIMUM_DIGEST_SIZE 20 #define TPM_SUCCESS ((uint32_t)0x00000000) diff --git a/src/security/tpm/tss/tcg-1.2/tss.c b/src/security/tpm/tss/tcg-1.2/tss.c index 8f22894..320fab5 100644 --- a/src/security/tpm/tss/tcg-1.2/tss.c +++ b/src/security/tpm/tss/tcg-1.2/tss.c @@ -24,19 +24,21 @@ #include <console/console.h> #define VBDEBUG(format, args...) printk(BIOS_DEBUG, format, ## args)
-static int tpm_send_receive(const uint8_t *request, +static TPM_RESULT 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(request, request_length, response, &len)) - return VB2_ERROR_UNKNOWN; + TPM_RESULT rc = tis_sendrecv(request, request_length, response, &len); + if (rc) + return rc; /* check 64->32bit overflow and (re)check response buffer overflow */ if (len > *response_length) - return VB2_ERROR_UNKNOWN; - *response_length = len; - return VB2_SUCCESS; + rc = TPM_FAIL; + else + *response_length = len; + return rc; }
/* Sets the size field of a TPM command. */ @@ -55,15 +57,15 @@ }
/* Gets the code field of a TPM command. */ -static inline int tpm_command_code(const uint8_t *buffer) +static inline TPM_RESULT tpm_command_code(const uint8_t *buffer) { - uint32_t code; + TPM_RESULT code; from_tpm_uint32(buffer + sizeof(uint16_t) + sizeof(uint32_t), &code); return code; }
/* Gets the return code field of a TPM result. */ -static inline int tpm_return_code(const uint8_t *buffer) +static inline TPM_RESULT tpm_return_code(const uint8_t *buffer) { return tpm_command_code(buffer); } @@ -72,15 +74,15 @@ * Like TlclSendReceive below, but do not retry if NEEDS_SELFTEST or * DOING_SELFTEST errors are returned. */ -static uint32_t tlcl_send_receive_no_retry(const uint8_t *request, +static TPM_RESULT tlcl_send_receive_no_retry(const uint8_t *request, uint8_t *response, int max_length) { uint32_t response_length = max_length; - uint32_t rc; + TPM_RESULT rc;
rc = tpm_send_receive(request, tpm_command_size(request), response, &response_length); - if (rc != 0) { + if (rc != TPM_SUCCESS) { /* Communication with TPM failed, so response is garbage */ VBDEBUG("TPM: command 0x%x send/receive failed: 0x%x\n", tpm_command_code(request), rc); @@ -101,10 +103,10 @@
/* Sends a TPM command and gets a response. Returns 0 if success or the TPM * error code if error. Waits for the self test to complete if needed. */ -uint32_t tlcl_send_receive(const uint8_t *request, uint8_t *response, +TPM_RESULT tlcl_send_receive(const uint8_t *request, uint8_t *response, int max_length) { - uint32_t rc = tlcl_send_receive_no_retry(request, response, + TPM_RESULT rc = tlcl_send_receive_no_retry(request, response, max_length); /* If the command fails because the self test has not completed, try it * again after attempting to ensure that the self test has completed. */ @@ -132,7 +134,7 @@ }
/* Sends a command and returns the error code. */ -static uint32_t send(const uint8_t *command) +static TPM_RESULT send(const uint8_t *command) { uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE]; return tlcl_send_receive(command, response, sizeof(response)); @@ -142,46 +144,48 @@
static uint8_t tlcl_init_done;
-uint32_t tlcl_lib_init(void) +TPM_RESULT tlcl_lib_init(void) { + TPM_RESULT rc = TPM_SUCCESS; if (tlcl_init_done) - return VB2_SUCCESS; - - if (tis_init()) - return VB2_ERROR_UNKNOWN; - if (tis_open()) - return VB2_ERROR_UNKNOWN; + return rc; + rc = tis_init(); + if (rc) + return rc; + rc = tis_open(); + if (rc) + return rc;
tlcl_init_done = 1;
- return VB2_SUCCESS; + return TPM_SUCCESS; }
-uint32_t tlcl_startup(void) +TPM_RESULT tlcl_startup(void) { VBDEBUG("TPM: Startup\n"); return send(tpm_startup_cmd.buffer); }
-uint32_t tlcl_resume(void) +TPM_RESULT tlcl_resume(void) { VBDEBUG("TPM: Resume\n"); return send(tpm_resume_cmd.buffer); }
-uint32_t tlcl_save_state(void) +TPM_RESULT tlcl_save_state(void) { VBDEBUG("TPM: Save state\n"); return send(tpm_savestate_cmd.buffer); }
-uint32_t tlcl_self_test_full(void) +TPM_RESULT tlcl_self_test_full(void) { VBDEBUG("TPM: Self test full\n"); return send(tpm_selftestfull_cmd.buffer); }
-uint32_t tlcl_continue_self_test(void) +TPM_RESULT tlcl_continue_self_test(void) { uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE]; VBDEBUG("TPM: Continue self test\n"); @@ -190,7 +194,7 @@ response, sizeof(response)); }
-uint32_t tlcl_define_space(uint32_t index, uint32_t perm, uint32_t size) +TPM_RESULT tlcl_define_space(uint32_t index, uint32_t perm, uint32_t size) { struct s_tpm_nv_definespace_cmd cmd; VBDEBUG("TPM: TlclDefineSpace(0x%x, 0x%x, %d)\n", index, perm, size); @@ -201,7 +205,7 @@ return send(cmd.buffer); }
-uint32_t tlcl_write(uint32_t index, const void *data, uint32_t length) +TPM_RESULT tlcl_write(uint32_t index, const void *data, uint32_t length) { struct s_tpm_nv_write_cmd cmd; uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE]; @@ -221,7 +225,7 @@ return tlcl_send_receive(cmd.buffer, response, sizeof(response)); }
-uint32_t tlcl_read(uint32_t index, void *data, uint32_t length) +TPM_RESULT tlcl_read(uint32_t index, void *data, uint32_t length) { struct s_tpm_nv_read_cmd cmd; uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE]; @@ -246,43 +250,43 @@ return rc; }
-uint32_t tlcl_assert_physical_presence(void) +TPM_RESULT tlcl_assert_physical_presence(void) { VBDEBUG("TPM: Asserting physical presence\n"); return send(tpm_ppassert_cmd.buffer); }
-uint32_t tlcl_physical_presence_cmd_enable(void) +TPM_RESULT tlcl_physical_presence_cmd_enable(void) { VBDEBUG("TPM: Enable the physical presence command\n"); return send(tpm_ppenable_cmd.buffer); }
-uint32_t tlcl_finalize_physical_presence(void) +TPM_RESULT tlcl_finalize_physical_presence(void) { VBDEBUG("TPM: Enable PP cmd, disable HW pp, and set lifetime lock\n"); return send(tpm_finalizepp_cmd.buffer); }
-uint32_t tlcl_set_nv_locked(void) +TPM_RESULT tlcl_set_nv_locked(void) { VBDEBUG("TPM: Set NV locked\n"); return tlcl_define_space(TPM_NV_INDEX_LOCK, 0, 0); }
-uint32_t tlcl_force_clear(void) +TPM_RESULT tlcl_force_clear(void) { VBDEBUG("TPM: Force clear\n"); return send(tpm_forceclear_cmd.buffer); }
-uint32_t tlcl_set_enable(void) +TPM_RESULT tlcl_set_enable(void) { VBDEBUG("TPM: Enabling TPM\n"); return send(tpm_physicalenable_cmd.buffer); }
-uint32_t tlcl_set_deactivated(uint8_t flag) +TPM_RESULT tlcl_set_deactivated(uint8_t flag) { struct s_tpm_physicalsetdeactivated_cmd cmd; VBDEBUG("TPM: SetDeactivated(%d)\n", flag); @@ -291,11 +295,11 @@ return send(cmd.buffer); }
-uint32_t tlcl_get_permanent_flags(TPM_PERMANENT_FLAGS *pflags) +TPM_RESULT tlcl_get_permanent_flags(TPM_PERMANENT_FLAGS *pflags) { uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE]; uint32_t size; - uint32_t rc = tlcl_send_receive(tpm_getflags_cmd.buffer, response, + TPM_RESULT rc = tlcl_send_receive(tpm_getflags_cmd.buffer, response, sizeof(response)); if (rc != TPM_SUCCESS) return rc; @@ -307,11 +311,11 @@ return rc; }
-uint32_t tlcl_get_flags(uint8_t *disable, uint8_t *deactivated, +TPM_RESULT tlcl_get_flags(uint8_t *disable, uint8_t *deactivated, uint8_t *nvlocked) { TPM_PERMANENT_FLAGS pflags; - uint32_t rc = tlcl_get_permanent_flags(&pflags); + TPM_RESULT rc = tlcl_get_permanent_flags(&pflags); if (rc == TPM_SUCCESS) { if (disable) *disable = pflags.disable; @@ -325,13 +329,13 @@ return rc; }
-uint32_t tlcl_set_global_lock(void) +TPM_RESULT tlcl_set_global_lock(void) { VBDEBUG("TPM: Set global lock\n"); return tlcl_write(TPM_NV_INDEX0, NULL, 0); }
-uint32_t tlcl_extend(int pcr_num, const uint8_t *digest_data, +TPM_RESULT tlcl_extend(int pcr_num, const uint8_t *digest_data, enum vb2_hash_algorithm digest_algo) { struct s_tpm_extend_cmd cmd; @@ -347,12 +351,12 @@ return tlcl_send_receive(cmd.buffer, response, sizeof(response)); }
-uint32_t tlcl_get_permissions(uint32_t index, uint32_t *permissions) +TPM_RESULT tlcl_get_permissions(uint32_t index, uint32_t *permissions) { struct s_tpm_getpermissions_cmd cmd; uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE]; uint8_t *nvdata; - uint32_t rc; + TPM_RESULT rc; uint32_t size;
memcpy(&cmd, &tpm_getpermissions_cmd, sizeof(cmd)); diff --git a/src/security/tpm/tss/tcg-2.0/tss.c b/src/security/tpm/tss/tcg-2.0/tss.c index b219c83..19fa150 100644 --- a/src/security/tpm/tss/tcg-2.0/tss.c +++ b/src/security/tpm/tss/tcg-2.0/tss.c @@ -46,7 +46,7 @@ return tpm_unmarshal_response(command, &ib); }
-static uint32_t tlcl_send_startup(TPM_SU type) +static TPM_RESULT tlcl_send_startup(TPM_SU type) { struct tpm2_startup startup; struct tpm2_response *response; @@ -75,12 +75,12 @@ return TPM_IOERROR; }
-uint32_t tlcl_resume(void) +TPM_RESULT tlcl_resume(void) { return tlcl_send_startup(TPM_SU_STATE); }
-static uint32_t tlcl_send_shutdown(TPM_SU type) +static TPM_RESULT tlcl_send_shutdown(TPM_SU type) { struct tpm2_shutdown shutdown; struct tpm2_response *response; @@ -104,12 +104,12 @@ return TPM_IOERROR; }
-uint32_t tlcl_save_state(void) +TPM_RESULT tlcl_save_state(void) { return tlcl_send_shutdown(TPM_SU_STATE); }
-uint32_t tlcl_assert_physical_presence(void) +TPM_RESULT tlcl_assert_physical_presence(void) { /* * Nothing to do on TPM2 for this, use platform hierarchy availability @@ -135,7 +135,7 @@ } }
-uint32_t tlcl_extend(int pcr_num, const uint8_t *digest_data, +TPM_RESULT tlcl_extend(int pcr_num, const uint8_t *digest_data, enum vb2_hash_algorithm digest_type) { struct tpm2_pcr_extend_cmd pcr_ext_cmd; @@ -163,14 +163,14 @@ return TPM_SUCCESS; }
-uint32_t tlcl_finalize_physical_presence(void) +TPM_RESULT tlcl_finalize_physical_presence(void) { /* Nothing needs to be done with tpm2. */ printk(BIOS_INFO, "%s:%s:%d\n", __FILE__, __func__, __LINE__); return TPM_SUCCESS; }
-uint32_t tlcl_force_clear(void) +TPM_RESULT tlcl_force_clear(void) { struct tpm2_response *response;
@@ -184,7 +184,7 @@ return TPM_SUCCESS; }
-uint32_t tlcl_clear_control(bool disable) +TPM_RESULT tlcl_clear_control(bool disable) { struct tpm2_response *response; struct tpm2_clear_control_cmd cc = { @@ -204,33 +204,36 @@ static uint8_t tlcl_init_done;
/* This function is called directly by vboot, uses vboot return types. */ -uint32_t tlcl_lib_init(void) +TPM_RESULT tlcl_lib_init(void) { + TPM_RESULT rc = TPM_SUCCESS; if (tlcl_init_done) - return VB2_SUCCESS; + return rc;
- if (tis_init()) { + rc = tis_init(); + if (rc) { printk(BIOS_ERR, "%s: tis_init returned error\n", __func__); - return VB2_ERROR_UNKNOWN; + return rc; } - - if (tis_open()) { - printk(BIOS_ERR, "%s: tis_open returned error\n", __func__); - return VB2_ERROR_UNKNOWN; + rc = tis_open(); + if (rc) { + printk(BIOS_ERR, "%s: tis_open returned error %d\n" + , __func__, rc); + return rc; }
tlcl_init_done = 1;
- return VB2_SUCCESS; + return rc; }
-uint32_t tlcl_physical_presence_cmd_enable(void) +TPM_RESULT tlcl_physical_presence_cmd_enable(void) { printk(BIOS_INFO, "%s:%s:%d\n", __FILE__, __func__, __LINE__); return TPM_SUCCESS; }
-uint32_t tlcl_read(uint32_t index, void *data, uint32_t length) +TPM_RESULT tlcl_read(uint32_t index, void *data, uint32_t length) { struct tpm2_nv_read_cmd nv_readc; struct tpm2_response *response; @@ -279,7 +282,7 @@ return TPM_SUCCESS; }
-uint32_t tlcl_self_test_full(void) +TPM_RESULT tlcl_self_test_full(void) { struct tpm2_self_test st; struct tpm2_response *response; @@ -292,7 +295,7 @@ return TPM_SUCCESS; }
-uint32_t tlcl_lock_nv_write(uint32_t index) +TPM_RESULT tlcl_lock_nv_write(uint32_t index) { struct tpm2_response *response; /* TPM Will reject attempts to write at non-defined index. */ @@ -311,12 +314,12 @@ return TPM_SUCCESS; }
-uint32_t tlcl_startup(void) +TPM_RESULT tlcl_startup(void) { return tlcl_send_startup(TPM_SU_CLEAR); }
-uint32_t tlcl_write(uint32_t index, const void *data, uint32_t length) +TPM_RESULT tlcl_write(uint32_t index, const void *data, uint32_t length) { struct tpm2_nv_write_cmd nv_writec; struct tpm2_response *response; @@ -339,7 +342,7 @@ return TPM_SUCCESS; }
-uint32_t tlcl_set_bits(uint32_t index, uint64_t bits) +TPM_RESULT tlcl_set_bits(uint32_t index, uint64_t bits) { struct tpm2_nv_setbits_cmd nvsb_cmd; struct tpm2_response *response; @@ -362,7 +365,7 @@ return TPM_SUCCESS; }
-uint32_t tlcl_define_space(uint32_t space_index, size_t space_size, +TPM_RESULT tlcl_define_space(uint32_t space_index, size_t space_size, const TPMA_NV nv_attributes, const uint8_t *nv_policy, size_t nv_policy_size) { @@ -437,7 +440,7 @@ return value; }
-uint32_t tlcl_disable_platform_hierarchy(void) +TPM_RESULT tlcl_disable_platform_hierarchy(void) { struct tpm2_response *response; struct tpm2_hierarchy_control_cmd hc = { @@ -453,7 +456,7 @@ return TPM_SUCCESS; }
-uint32_t tlcl_get_capability(TPM_CAP capability, uint32_t property, +TPM_RESULT tlcl_get_capability(TPM_CAP capability, uint32_t property, uint32_t property_count, TPMS_CAPABILITY_DATA *capability_data) { diff --git a/src/security/tpm/tss/vendor/cr50/cr50.c b/src/security/tpm/tss/vendor/cr50/cr50.c index f52c41f..e1c4bf3 100644 --- a/src/security/tpm/tss/vendor/cr50/cr50.c +++ b/src/security/tpm/tss/vendor/cr50/cr50.c @@ -9,7 +9,7 @@
#include "../../tcg-2.0/tss_marshaling.h"
-uint32_t tlcl_cr50_enable_nvcommits(void) +TPM_RESULT tlcl_cr50_enable_nvcommits(void) { uint16_t sub_command = TPM2_CR50_SUB_CMD_NVMEM_ENABLE_COMMITS; struct tpm2_response *response; @@ -29,7 +29,7 @@ return TPM_SUCCESS; }
-uint32_t tlcl_cr50_enable_update(uint16_t timeout_ms, +TPM_RESULT tlcl_cr50_enable_update(uint16_t timeout_ms, uint8_t *num_restored_headers) { struct tpm2_response *response; @@ -48,7 +48,7 @@ return TPM_SUCCESS; }
-uint32_t tlcl_cr50_get_recovery_button(uint8_t *recovery_button_state) +TPM_RESULT tlcl_cr50_get_recovery_button(uint8_t *recovery_button_state) { struct tpm2_response *response; uint16_t sub_command = TPM2_CR50_SUB_CMD_GET_REC_BTN; @@ -64,7 +64,7 @@ return TPM_SUCCESS; }
-uint32_t tlcl_cr50_get_tpm_mode(uint8_t *tpm_mode) +TPM_RESULT tlcl_cr50_get_tpm_mode(uint8_t *tpm_mode) { struct tpm2_response *response; uint16_t mode_command = TPM2_CR50_SUB_CMD_TPM_MODE; @@ -105,7 +105,7 @@ return TPM_SUCCESS; }
-uint32_t tlcl_cr50_get_boot_mode(uint8_t *boot_mode) +TPM_RESULT tlcl_cr50_get_boot_mode(uint8_t *boot_mode) { struct tpm2_response *response; uint16_t mode_command = TPM2_CR50_SUB_CMD_GET_BOOT_MODE; @@ -131,7 +131,7 @@ return TPM_SUCCESS; }
-uint32_t tlcl_cr50_immediate_reset(uint16_t timeout_ms) +TPM_RESULT tlcl_cr50_immediate_reset(uint16_t timeout_ms) { struct tpm2_response *response; uint16_t reset_command_body[] = { @@ -150,7 +150,7 @@ return TPM_SUCCESS; }
-uint32_t tlcl_cr50_reset_ec(void) +TPM_RESULT tlcl_cr50_reset_ec(void) { struct tpm2_response *response; uint16_t reset_cmd = TPM2_CR50_SUB_CMD_RESET_EC; diff --git a/src/security/tpm/tss/vendor/cr50/cr50.h b/src/security/tpm/tss/vendor/cr50/cr50.h index 02d1ea1..be84a0d 100644 --- a/src/security/tpm/tss/vendor/cr50/cr50.h +++ b/src/security/tpm/tss/vendor/cr50/cr50.h @@ -3,6 +3,7 @@ #define CR50_TSS_STRUCTURES_H_
#include <stdint.h> +#include <security/tpm/tss/common/tss_common.h>
/* FIXME: below is not enough to differentiate between vendors commands of numerous devices. However, the current tpm2 APIs aren't very amenable @@ -45,7 +46,7 @@ * CR50 specific tpm command to enable nvmem commits before internal timeout * expires. */ -uint32_t tlcl_cr50_enable_nvcommits(void); +TPM_RESULT tlcl_cr50_enable_nvcommits(void);
/** * CR50 specific tpm command to restore header(s) of the dormant RO/RW @@ -56,7 +57,7 @@ * Return value indicates success or failure of accessing the TPM; in case of * success the number of restored headers is saved in num_restored_headers. */ -uint32_t tlcl_cr50_enable_update(uint16_t timeout_ms, +TPM_RESULT tlcl_cr50_enable_update(uint16_t timeout_ms, uint8_t *num_restored_headers);
/** @@ -65,7 +66,7 @@ * Return value indicates success or failure of accessing the TPM; in case of * success the recovery button state is saved in recovery_button_state. */ -uint32_t tlcl_cr50_get_recovery_button(uint8_t *recovery_button_state); +TPM_RESULT tlcl_cr50_get_recovery_button(uint8_t *recovery_button_state);
/** * CR50 specific TPM command sequence to query the current TPM mode. @@ -77,7 +78,7 @@ * Returns TPM_NO_SUCH_COMMAND if the Cr50 does not support the command. * Other returns value indicate a failure accessing the TPM. */ -uint32_t tlcl_cr50_get_tpm_mode(uint8_t *tpm_mode); +TPM_RESULT tlcl_cr50_get_tpm_mode(uint8_t *tpm_mode);
/** * CR50 specific TPM command sequence to query the current boot mode. @@ -85,7 +86,7 @@ * Returns TPM_SUCCESS if boot mode is successfully retrieved. * Returns TPM_* for errors. */ -uint32_t tlcl_cr50_get_boot_mode(uint8_t *boot_mode); +TPM_RESULT tlcl_cr50_get_boot_mode(uint8_t *boot_mode);
/** * CR50 specific TPM command sequence to trigger an immediate reset to the Cr50 @@ -94,7 +95,7 @@ * * Return value indicates success or failure of accessing the TPM. */ -uint32_t tlcl_cr50_immediate_reset(uint16_t timeout_ms); +TPM_RESULT tlcl_cr50_immediate_reset(uint16_t timeout_ms);
/** * CR50 specific TPM command sequence to issue an EC reset. @@ -102,6 +103,6 @@ * Returns TPM_* for errors. * On Success, this function invokes halt() and does not return. */ -uint32_t tlcl_cr50_reset_ec(void); +TPM_RESULT tlcl_cr50_reset_ec(void);
#endif /* CR50_TSS_STRUCTURES_H_ */ diff --git a/src/security/tpm/tss_errors.h b/src/security/tpm/tss_errors.h index 48e49c6..136100d 100644 --- a/src/security/tpm/tss_errors.h +++ b/src/security/tpm/tss_errors.h @@ -4,12 +4,13 @@ * TPM error codes. * * Copy-pasted and lightly edited from TCG TPM Main Part 2 TPM Structures - * Version 1.2 Level 2 Revision 103 26 October 2006 Draft. + * Version 1.2 Level 2 Revision 116 1 March 2011. */
#ifndef TSS_ERRORS_H_ #define TSS_ERRORS_H_
+#include <security/tpm/tss/common/tss_common.h> #include <stdint.h>
typedef uint32_t TPM_RESULT; @@ -20,6 +21,8 @@ #define TPM_VENDOR_ERROR 0x5000
#define TPM_BADINDEX ((TPM_RESULT) (TPM_BASE + 2)) +#define TPM_BAD_PARAMETER ((TPM_RESULT) (TPM_BASE + 3)) +#define TPM_FAIL ((TPM_RESULT) (TPM_BASE + 9)) #define TPM_OWNER_SET ((TPM_RESULT) (TPM_BASE + 20)) #define TPM_IOERROR ((TPM_RESULT) (TPM_BASE + 31)) #define TPM_INVALID_POSTINIT ((TPM_RESULT) (TPM_BASE + 38)) diff --git a/src/security/vboot/antirollback.h b/src/security/vboot/antirollback.h index ab7c43a..d559b8d 100644 --- a/src/security/vboot/antirollback.h +++ b/src/security/vboot/antirollback.h @@ -10,6 +10,7 @@
#include <types.h> #include <security/tpm/tspi.h> +#include <security/tpm/tss/common/tss_common.h> #include <vb2_sha.h>
struct vb2_context; @@ -52,23 +53,23 @@
/* All functions return TPM_SUCCESS (zero) if successful, non-zero if error */
-uint32_t antirollback_read_space_firmware(struct vb2_context *ctx); +TPM_RESULT antirollback_read_space_firmware(struct vb2_context *ctx);
/** * Write may be called if the versions change. */ -uint32_t antirollback_write_space_firmware(struct vb2_context *ctx); +TPM_RESULT antirollback_write_space_firmware(struct vb2_context *ctx);
/** * Read and write kernel space in TPM. */ -uint32_t antirollback_read_space_kernel(struct vb2_context *ctx); -uint32_t antirollback_write_space_kernel(struct vb2_context *ctx); +TPM_RESULT antirollback_read_space_kernel(struct vb2_context *ctx); +TPM_RESULT antirollback_write_space_kernel(struct vb2_context *ctx);
/** * Lock must be called. */ -uint32_t antirollback_lock_space_firmware(void); +TPM_RESULT antirollback_lock_space_firmware(void);
/* * Read MRC hash data from TPM. @@ -79,7 +80,7 @@ * @param data pointer to buffer where hash from TPM read into * @param size size of buffer */ -uint32_t antirollback_read_space_mrc_hash(uint32_t index, uint8_t *data, uint32_t size); +TPM_RESULT antirollback_read_space_mrc_hash(uint32_t index, uint8_t *data, uint32_t size); /* * Write new hash data to MRC space in TPM.\ * @param index index into TPM NVRAM where hash is stored The index @@ -89,7 +90,7 @@ * @param data pointer to buffer of hash value to be written * @param size size of buffer */ -uint32_t antirollback_write_space_mrc_hash(uint32_t index, const uint8_t *data, +TPM_RESULT antirollback_write_space_mrc_hash(uint32_t index, const uint8_t *data, uint32_t size); /* * Lock down MRC hash space in TPM. @@ -98,19 +99,19 @@ * MRC_RW_HASH_NV_INDEX depending upon whether we are * booting in recovery or normal mode. */ -uint32_t antirollback_lock_space_mrc_hash(uint32_t index); +TPM_RESULT antirollback_lock_space_mrc_hash(uint32_t index);
/* * Read VBIOS hash data from TPM. * @param data pointer to buffer where hash from TPM read into * @param size size of buffer */ -uint32_t antirollback_read_space_vbios_hash(uint8_t *data, uint32_t size); +TPM_RESULT antirollback_read_space_vbios_hash(uint8_t *data, uint32_t size); /* * Write new hash data to VBIOS space in TPM. * @param data pointer to buffer of hash value to be written * @param size size of buffer */ -uint32_t antirollback_write_space_vbios_hash(const uint8_t *data, uint32_t size); +TPM_RESULT antirollback_write_space_vbios_hash(const uint8_t *data, uint32_t size);
#endif /* ANTIROLLBACK_H_ */ diff --git a/src/security/vboot/mrc_cache_hash_tpm.c b/src/security/vboot/mrc_cache_hash_tpm.c index f67eae4..be9b3ce 100644 --- a/src/security/vboot/mrc_cache_hash_tpm.c +++ b/src/security/vboot/mrc_cache_hash_tpm.c @@ -14,7 +14,7 @@ struct vb2_hash hash;
/* Initialize TPM driver. */ - if (tlcl_lib_init() != VB2_SUCCESS) { + if (tlcl_lib_init() != TPM_SUCCESS) { printk(BIOS_ERR, "MRC: TPM driver initialization failed.\n"); return; } @@ -49,7 +49,7 @@ struct vb2_hash tpm_hash = { .algo = VB2_HASH_SHA256 };
/* Initialize TPM driver. */ - if (tlcl_lib_init() != VB2_SUCCESS) { + if (tlcl_lib_init() != TPM_SUCCESS) { printk(BIOS_ERR, "MRC: TPM driver initialization failed.\n"); return 0; } diff --git a/src/security/vboot/secdata_mock.c b/src/security/vboot/secdata_mock.c index 9d8c13d..2f9ed74 100644 --- a/src/security/vboot/secdata_mock.c +++ b/src/security/vboot/secdata_mock.c @@ -6,27 +6,28 @@ */
#include <security/tpm/tspi.h> +#include <security/tpm/tss/common/tss_common.h> #include <vb2_api.h>
#include "antirollback.h"
-vb2_error_t vb2ex_tpm_clear_owner(struct vb2_context *ctx) +TPM_RESULT vb2ex_tpm_clear_owner(struct vb2_context *ctx) { - return VB2_SUCCESS; + return TPM_SUCCESS; }
-vb2_error_t antirollback_read_space_firmware(struct vb2_context *ctx) +TPM_RESULT antirollback_read_space_firmware(struct vb2_context *ctx) { vb2api_secdata_firmware_create(ctx); - return VB2_SUCCESS; + return TPM_SUCCESS; }
-vb2_error_t antirollback_write_space_firmware(struct vb2_context *ctx) +TPM_RESULT antirollback_write_space_firmware(struct vb2_context *ctx) { - return VB2_SUCCESS; + return TPM_SUCCESS; }
-vb2_error_t antirollback_read_space_kernel(struct vb2_context *ctx) +TPM_RESULT antirollback_read_space_kernel(struct vb2_context *ctx) { /* * The new kernel secdata v1 stores the last read EC hash, and reboots the @@ -41,41 +42,41 @@ * v0 device when using MOCK_SECDATA. */ vb2api_secdata_kernel_create_v0(ctx); - return VB2_SUCCESS; + return TPM_SUCCESS; }
-vb2_error_t antirollback_write_space_kernel(struct vb2_context *ctx) +TPM_RESULT antirollback_write_space_kernel(struct vb2_context *ctx) { - return VB2_SUCCESS; + return TPM_SUCCESS; }
-vb2_error_t antirollback_lock_space_firmware(void) +TPM_RESULT antirollback_lock_space_firmware(void) { - return VB2_SUCCESS; + return TPM_SUCCESS; }
-vb2_error_t antirollback_lock_space_mrc_hash(uint32_t index) +TPM_RESULT antirollback_lock_space_mrc_hash(uint32_t index) { - return VB2_SUCCESS; + return TPM_SUCCESS; }
-vb2_error_t antirollback_read_space_mrc_hash(uint32_t index, uint8_t *data, uint32_t size) +TPM_RESULT antirollback_read_space_mrc_hash(uint32_t index, uint8_t *data, uint32_t size) { - return VB2_SUCCESS; + return TPM_SUCCESS; }
-vb2_error_t antirollback_write_space_mrc_hash(uint32_t index, const uint8_t *data, +TPM_RESULT antirollback_write_space_mrc_hash(uint32_t index, const uint8_t *data, uint32_t size) { - return VB2_SUCCESS; + return TPM_SUCCESS; }
-vb2_error_t antirollback_read_space_vbios_hash(uint8_t *data, uint32_t size) +TPM_RESULT antirollback_read_space_vbios_hash(uint8_t *data, uint32_t size) { - return VB2_SUCCESS; + return TPM_SUCCESS; }
-vb2_error_t antirollback_write_space_vbios_hash(const uint8_t *data, uint32_t size) +TPM_RESULT antirollback_write_space_vbios_hash(const uint8_t *data, uint32_t size) { - return VB2_SUCCESS; + return TPM_SUCCESS; } diff --git a/src/security/vboot/secdata_tpm.c b/src/security/vboot/secdata_tpm.c index c17b717..efbf0ad 100644 --- a/src/security/vboot/secdata_tpm.c +++ b/src/security/vboot/secdata_tpm.c @@ -18,7 +18,7 @@ printk(BIOS_INFO, "%s():%d: " format, __func__, __LINE__, ## args)
#define RETURN_ON_FAILURE(tpm_cmd) do { \ - uint32_t rc_; \ + TPM_RESULT rc_; \ if ((rc_ = (tpm_cmd)) != TPM_SUCCESS) { \ VBDEBUG("Antirollback: %08x returned by " #tpm_cmd \ "\n", (int)rc_); \ @@ -26,9 +26,9 @@ } \ } while (0)
-static uint32_t safe_write(uint32_t index, const void *data, uint32_t length); +static TPM_RESULT safe_write(uint32_t index, const void *data, uint32_t length);
-uint32_t antirollback_read_space_kernel(struct vb2_context *ctx) +TPM_RESULT antirollback_read_space_kernel(struct vb2_context *ctx) { if (!CONFIG(TPM2)) { /* @@ -51,7 +51,7 @@ }
uint8_t size = VB2_SECDATA_KERNEL_SIZE; - uint32_t rc; + TPM_RESULT rc;
/* Start with the version 1.0 size used by all modern Cr50/Ti50 boards. */ rc = tlcl_read(KERNEL_NV_INDEX, ctx->secdata_kernel, size); @@ -72,7 +72,7 @@
#if CONFIG(TPM2)
-static uint32_t read_space_mrc_hash(uint32_t index, uint8_t *data) +static TPM_RESULT read_space_mrc_hash(uint32_t index, uint8_t *data) { RETURN_ON_FAILURE(tlcl_read(index, data, HASH_NV_SIZE)); @@ -206,7 +206,7 @@ const TPMA_NV nv_attributes, const uint8_t *nv_policy, size_t nv_policy_size) { - uint32_t rc; + TPM_RESULT rc;
rc = tlcl_define_space(index, length, nv_attributes, nv_policy, nv_policy_size); @@ -227,16 +227,16 @@ }
/* Nothing special in the TPM2 path yet. */ -static uint32_t safe_write(uint32_t index, const void *data, uint32_t length) +static TPM_RESULT safe_write(uint32_t index, const void *data, uint32_t length) { return tlcl_write(index, data, length); }
-static uint32_t setup_space(const char *name, uint32_t index, const void *data, +static TPM_RESULT setup_space(const char *name, uint32_t index, const void *data, uint32_t length, const TPMA_NV nv_attributes, const uint8_t *nv_policy, size_t nv_policy_size) { - uint32_t rc; + TPM_RESULT rc;
rc = define_space(name, index, length, nv_attributes, nv_policy, nv_policy_size); @@ -289,9 +289,9 @@ * * These spaces are not used by firmware, but we do need to initialize them. */ -static uint32_t setup_zte_spaces(void) +static TPM_RESULT setup_zte_spaces(void) { - uint32_t rc; + TPM_RESULT rc; uint64_t rma_bytes_counter_default = 0; uint8_t rma_sn_bits_default[16]; uint8_t board_id_default[12]; @@ -361,9 +361,10 @@ unsatisfiable_policy, sizeof(unsatisfiable_policy)); }
-static uint32_t setup_widevine_counter_spaces(void) +static TPM_RESULT setup_widevine_counter_spaces(void) { - uint32_t index, rc; + uint32_t index; + TPM_RESULT rc;
for (index = 0; index < NUM_WIDEVINE_COUNTERS; index++) { rc = define_space(WIDEVINE_COUNTER_NAME, @@ -375,10 +376,10 @@ if (rc != TPM_SUCCESS) return rc; } - return TPM_SUCCESS; + return rc; }
-static uint32_t _factory_initialize_tpm(struct vb2_context *ctx) +static TPM_RESULT _factory_initialize_tpm(struct vb2_context *ctx) { RETURN_ON_FAILURE(tlcl_force_clear());
@@ -428,12 +429,12 @@ return TPM_SUCCESS; }
-uint32_t antirollback_lock_space_firmware(void) +TPM_RESULT antirollback_lock_space_firmware(void) { return tlcl_lock_nv_write(FIRMWARE_NV_INDEX); }
-uint32_t antirollback_read_space_mrc_hash(uint32_t index, uint8_t *data, uint32_t size) +TPM_RESULT antirollback_read_space_mrc_hash(uint32_t index, uint8_t *data, uint32_t size) { if (size != HASH_NV_SIZE) { VBDEBUG("TPM: Incorrect buffer size for hash idx 0x%x. " @@ -444,10 +445,10 @@ return read_space_mrc_hash(index, data); }
-uint32_t antirollback_write_space_mrc_hash(uint32_t index, const uint8_t *data, uint32_t size) +TPM_RESULT antirollback_write_space_mrc_hash(uint32_t index, const uint8_t *data, uint32_t size) { uint8_t spc_data[HASH_NV_SIZE]; - uint32_t rc; + TPM_RESULT rc;
if (size != HASH_NV_SIZE) { VBDEBUG("TPM: Incorrect buffer size for hash idx 0x%x. " @@ -472,18 +473,18 @@ return safe_write(index, data, size); }
-uint32_t antirollback_lock_space_mrc_hash(uint32_t index) +TPM_RESULT antirollback_lock_space_mrc_hash(uint32_t index) { return tlcl_lock_nv_write(index); }
-static uint32_t read_space_vbios_hash(uint8_t *data) +static TPM_RESULT read_space_vbios_hash(uint8_t *data) { RETURN_ON_FAILURE(tlcl_read(VBIOS_CACHE_NV_INDEX, data, HASH_NV_SIZE)); return TPM_SUCCESS; }
-uint32_t antirollback_read_space_vbios_hash(uint8_t *data, uint32_t size) +TPM_RESULT antirollback_read_space_vbios_hash(uint8_t *data, uint32_t size) { if (size != HASH_NV_SIZE) { VBDEBUG("TPM: Incorrect buffer size for hash idx 0x%x. " @@ -494,10 +495,10 @@ return read_space_vbios_hash(data); }
-uint32_t antirollback_write_space_vbios_hash(const uint8_t *data, uint32_t size) +TPM_RESULT antirollback_write_space_vbios_hash(const uint8_t *data, uint32_t size) { uint8_t spc_data[HASH_NV_SIZE]; - uint32_t rc; + TPM_RESULT rc;
if (size != HASH_NV_SIZE) { VBDEBUG("TPM: Incorrect buffer size for hash idx 0x%x. " @@ -532,9 +533,9 @@ * This is not expected to happen frequently, but it could happen. */
-static uint32_t safe_write(uint32_t index, const void *data, uint32_t length) +static TPM_RESULT safe_write(uint32_t index, const void *data, uint32_t length) { - uint32_t rc = tlcl_write(index, data, length); + TPM_RESULT rc = tlcl_write(index, data, length); if (rc == TPM_MAXNVWRITES) { RETURN_ON_FAILURE(tpm_clear_and_reenable()); return tlcl_write(index, data, length); @@ -549,9 +550,9 @@ * writes because we only define spaces once at initialization, but we'd * rather be paranoid about this. */ -static uint32_t safe_define_space(uint32_t index, uint32_t perm, uint32_t size) +static TPM_RESULT safe_define_space(uint32_t index, uint32_t perm, uint32_t size) { - uint32_t rc = tlcl_define_space(index, perm, size); + TPM_RESULT rc = tlcl_define_space(index, perm, size); if (rc == TPM_MAXNVWRITES) { RETURN_ON_FAILURE(tpm_clear_and_reenable()); return tlcl_define_space(index, perm, size); @@ -560,10 +561,10 @@ } }
-static uint32_t _factory_initialize_tpm(struct vb2_context *ctx) +static TPM_RESULT _factory_initialize_tpm(struct vb2_context *ctx) { TPM_PERMANENT_FLAGS pflags; - uint32_t rc; + TPM_RESULT rc;
vb2api_secdata_firmware_create(ctx); vb2api_secdata_kernel_create_v0(ctx); @@ -618,7 +619,7 @@ return TPM_SUCCESS; }
-uint32_t antirollback_lock_space_firmware(void) +TPM_RESULT antirollback_lock_space_firmware(void) { return tlcl_set_global_lock(); } @@ -632,9 +633,9 @@ * nvLocked bit and ensures the physical presence command is enabled and * locked. */ -static uint32_t factory_initialize_tpm(struct vb2_context *ctx) +static TPM_RESULT factory_initialize_tpm(struct vb2_context *ctx) { - uint32_t rc; + TPM_RESULT rc;
VBDEBUG("TPM: factory initialization\n");
@@ -664,9 +665,9 @@ return TPM_SUCCESS; }
-uint32_t antirollback_read_space_firmware(struct vb2_context *ctx) +TPM_RESULT antirollback_read_space_firmware(struct vb2_context *ctx) { - uint32_t rc; + TPM_RESULT rc;
rc = tlcl_read(FIRMWARE_NV_INDEX, ctx->secdata_firmware, VB2_SECDATA_FIRMWARE_SIZE); if (rc == TPM_BADINDEX) { @@ -678,10 +679,10 @@ return TPM_CORRUPTED_STATE; }
- return TPM_SUCCESS; + return rc; }
-uint32_t antirollback_write_space_firmware(struct vb2_context *ctx) +TPM_RESULT antirollback_write_space_firmware(struct vb2_context *ctx) { if (CONFIG(TPM_GOOGLE_IMMEDIATELY_COMMIT_FW_SECDATA)) tlcl_cr50_enable_nvcommits(); @@ -689,7 +690,7 @@ VB2_SECDATA_FIRMWARE_SIZE); }
-uint32_t antirollback_write_space_kernel(struct vb2_context *ctx) +TPM_RESULT antirollback_write_space_kernel(struct vb2_context *ctx) { /* Learn the expected size. */ uint8_t size = VB2_SECDATA_KERNEL_MIN_SIZE; @@ -708,12 +709,12 @@ return safe_write(KERNEL_NV_INDEX, ctx->secdata_kernel, size); }
-vb2_error_t vb2ex_tpm_clear_owner(struct vb2_context *ctx) +TPM_RESULT vb2ex_tpm_clear_owner(struct vb2_context *ctx) { - uint32_t rc; + TPM_RESULT rc; printk(BIOS_INFO, "Clearing TPM owner\n"); rc = tpm_clear_and_reenable(); if (rc) - return VB2_ERROR_EX_TPM_CLEAR_OWNER; - return VB2_SUCCESS; + return TPM_FAIL; + return TPM_SUCCESS; } diff --git a/src/security/vboot/tpm_common.c b/src/security/vboot/tpm_common.c index 146494f..f212924 100644 --- a/src/security/vboot/tpm_common.c +++ b/src/security/vboot/tpm_common.c @@ -2,15 +2,16 @@
#include <security/tpm/tspi.h> #include <security/vboot/tpm_common.h> +#include <security/tpm/tss/common/tss_common.h> #include <vb2_api.h> #include <vb2_sha.h>
#define TPM_PCR_BOOT_MODE "VBOOT: boot mode" #define TPM_PCR_GBB_HWID_NAME "VBOOT: GBB HWID"
-uint32_t vboot_setup_tpm(struct vb2_context *ctx) +TPM_RESULT vboot_setup_tpm(struct vb2_context *ctx) { - uint32_t rc; + TPM_RESULT rc;
rc = tpm_setup(ctx->flags & VB2_CONTEXT_S3_RESUME); if (rc == TPM_MUST_REBOOT) @@ -19,7 +20,7 @@ return rc; }
-vb2_error_t vboot_extend_pcr(struct vb2_context *ctx, int pcr, +TPM_RESULT vboot_extend_pcr(struct vb2_context *ctx, int pcr, enum vb2_pcr_digest which_digest) { uint8_t buffer[VB2_PCR_DIGEST_RECOMMENDED_SIZE]; @@ -28,9 +29,9 @@
rv = vb2api_get_pcr_digest(ctx, which_digest, buffer, &size); if (rv != VB2_SUCCESS) - return rv; + return TPM_FAIL; if (size < TPM_PCR_MINIMUM_DIGEST_SIZE) - return VB2_ERROR_UNKNOWN; + return TPM_FAIL;
/* * On TPM 1.2, all PCRs are intended for use with SHA1. We truncate our @@ -57,6 +58,6 @@ return tpm_extend_pcr(pcr, algo, buffer, vb2_digest_size(algo), TPM_PCR_GBB_HWID_NAME); default: - return VB2_ERROR_UNKNOWN; + return TPM_FAIL; } } diff --git a/src/security/vboot/tpm_common.h b/src/security/vboot/tpm_common.h index 7c440f5..2b763eb 100644 --- a/src/security/vboot/tpm_common.h +++ b/src/security/vboot/tpm_common.h @@ -3,10 +3,10 @@ #if CONFIG(TPM)
/* Start of the root of trust */ -uint32_t vboot_setup_tpm(struct vb2_context *ctx); +TPM_RESULT vboot_setup_tpm(struct vb2_context *ctx);
/* vboot_extend_pcr function for vb2 context */ -vb2_error_t vboot_extend_pcr(struct vb2_context *ctx, int pcr, +TPM_RESULT vboot_extend_pcr(struct vb2_context *ctx, int pcr, enum vb2_pcr_digest which_digest);
#else diff --git a/src/security/vboot/vbios_cache_hash_tpm.c b/src/security/vboot/vbios_cache_hash_tpm.c index aa54f19..ba6f550 100644 --- a/src/security/vboot/vbios_cache_hash_tpm.c +++ b/src/security/vboot/vbios_cache_hash_tpm.c @@ -14,7 +14,7 @@ struct vb2_hash hash;
/* Initialize TPM driver. */ - if (tlcl_lib_init() != VB2_SUCCESS) { + if (tlcl_lib_init() != TPM_SUCCESS) { printk(BIOS_ERR, "VBIOS_CACHE: TPM driver initialization failed.\n"); return; } @@ -50,7 +50,7 @@ struct vb2_hash tpm_hash = { .algo = VB2_HASH_SHA256 };
/* Initialize TPM driver. */ - if (tlcl_lib_init() != VB2_SUCCESS) { + if (tlcl_lib_init() != TPM_SUCCESS) { printk(BIOS_ERR, "VBIOS_CACHE: TPM driver initialization failed.\n"); return CB_ERR; } diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c index 3c4957a..4a02f8d 100644 --- a/src/security/vboot/vboot_common.c +++ b/src/security/vboot/vboot_common.c @@ -2,6 +2,7 @@
#include <console/cbmem_console.h> #include <reset.h> +#include <security/tpm/tss/common/tss_common.h> #include <security/vboot/misc.h> #include <security/vboot/vboot_common.h> #include <security/vboot/vbnv.h> @@ -12,14 +13,14 @@ static void save_secdata(struct vb2_context *ctx) { if (ctx->flags & VB2_CONTEXT_SECDATA_FIRMWARE_CHANGED - && (CONFIG(VBOOT_MOCK_SECDATA) || tlcl_lib_init() == VB2_SUCCESS)) { + && (CONFIG(VBOOT_MOCK_SECDATA) || tlcl_lib_init() == TPM_SUCCESS)) { printk(BIOS_INFO, "Saving secdata firmware\n"); antirollback_write_space_firmware(ctx); ctx->flags &= ~VB2_CONTEXT_SECDATA_FIRMWARE_CHANGED; }
if (ctx->flags & VB2_CONTEXT_SECDATA_KERNEL_CHANGED - && (CONFIG(VBOOT_MOCK_SECDATA) || tlcl_lib_init() == VB2_SUCCESS)) { + && (CONFIG(VBOOT_MOCK_SECDATA) || tlcl_lib_init() == TPM_SUCCESS)) { printk(BIOS_INFO, "Saving secdata kernel\n"); antirollback_write_space_kernel(ctx); ctx->flags &= ~VB2_CONTEXT_SECDATA_KERNEL_CHANGED; diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c index 8a6514a..f167437 100644 --- a/src/security/vboot/vboot_logic.c +++ b/src/security/vboot/vboot_logic.c @@ -7,6 +7,7 @@ #include <fmap.h> #include <security/tpm/tspi/crtm.h> #include <security/tpm/tss/vendor/cr50/cr50.h> +#include <security/tpm/tss/common/tss_common.h> #include <security/vboot/misc.h> #include <security/vboot/vbnv.h> #include <security/vboot/tpm_common.h> @@ -182,7 +183,7 @@ return handle_digest_result(hash_digest, hash_digest_sz); }
-static uint32_t extend_pcrs(struct vb2_context *ctx) +static TPM_RESULT extend_pcrs(struct vb2_context *ctx) { return vboot_extend_pcr(ctx, CONFIG_PCR_BOOT_MODE, BOOT_MODE_PCR) || vboot_extend_pcr(ctx, CONFIG_PCR_HWID, HWID_DIGEST_PCR); @@ -207,7 +208,7 @@ static void check_boot_mode(struct vb2_context *ctx) { uint8_t boot_mode; - int rc; + TPM_RESULT rc;
rc = tlcl_cr50_get_boot_mode(&boot_mode); switch (rc) { @@ -237,6 +238,7 @@ void verstage_main(void) { struct vb2_context *ctx; + TPM_RESULT tpm_rc; vb2_error_t rv;
timestamp_add_now(TS_VBOOT_START); @@ -358,10 +360,13 @@ /* Only extend PCRs once on boot. */ if (!(ctx->flags & VB2_CONTEXT_S3_RESUME)) { timestamp_add_now(TS_TPMPCR_START); - rv = extend_pcrs(ctx); - if (rv) { - printk(BIOS_WARNING, "Failed to extend TPM PCRs (%#x)\n", rv); - vboot_fail_and_reboot(ctx, VB2_RECOVERY_RO_TPM_U_ERROR, rv); + tpm_rc = extend_pcrs(ctx); + if (tpm_rc) { + printk(BIOS_WARNING, "Failed to extend TPM PCRs (%#x)\n", + tpm_rc); + vboot_fail_and_reboot(ctx, + VB2_RECOVERY_RO_TPM_U_ERROR, + 0); } timestamp_add_now(TS_TPMPCR_END); } @@ -369,18 +374,20 @@ /* Lock TPM */
timestamp_add_now(TS_TPMLOCK_START); - rv = antirollback_lock_space_firmware(); - if (rv) { - printk(BIOS_INFO, "Failed to lock TPM (%x)\n", rv); + tpm_rc = antirollback_lock_space_firmware(); + if (tpm_rc) { + printk(BIOS_INFO, "Failed to lock TPM (%x)\n", tpm_rc); vboot_fail_and_reboot(ctx, VB2_RECOVERY_RO_TPM_L_ERROR, 0); } timestamp_add_now(TS_TPMLOCK_END);
/* Lock rec hash space if available. */ if (CONFIG(VBOOT_HAS_REC_HASH_SPACE)) { - rv = antirollback_lock_space_mrc_hash(MRC_REC_HASH_NV_INDEX); - if (rv) { - printk(BIOS_INFO, "Failed to lock rec hash space(%x)\n", rv); + tpm_rc = antirollback_lock_space_mrc_hash( + MRC_REC_HASH_NV_INDEX); + if (tpm_rc) { + printk(BIOS_INFO, "Failed to lock rec hash space(%x)\n", + tpm_rc); vboot_fail_and_reboot(ctx, VB2_RECOVERY_RO_TPM_REC_HASH_L_ERROR, 0); } } diff --git a/src/soc/amd/common/psp_verstage/psp_verstage.c b/src/soc/amd/common/psp_verstage/psp_verstage.c index c905819..2ccb52e 100644 --- a/src/soc/amd/common/psp_verstage/psp_verstage.c +++ b/src/soc/amd/common/psp_verstage/psp_verstage.c @@ -208,7 +208,7 @@ */ static void psp_verstage_s0i3_resume(void) { - uint32_t rc; + TPM_RESULT rc;
post_code(POSTCODE_VERSTAGE_S0I3_RESUME);
diff --git a/src/vendorcode/eltan/security/mboot/mboot.c b/src/vendorcode/eltan/security/mboot/mboot.c index 39c7db6..e98075d 100644 --- a/src/vendorcode/eltan/security/mboot/mboot.c +++ b/src/vendorcode/eltan/security/mboot/mboot.c @@ -13,7 +13,7 @@ */ EFI_TCG2_EVENT_ALGORITHM_BITMAP tpm2_get_active_pcrs(void) { - int status; + TPM_RESULT status; TPML_PCR_SELECTION Pcrs; EFI_TCG2_EVENT_ALGORITHM_BITMAP tpmHashAlgorithmBitmap = 0; uint32_t activePcrBanks = 0; @@ -75,10 +75,10 @@ * @retval TPM_SUCCESS Operation completed successfully. * @retval TPM_IOERROR The command was unsuccessful. */ -int tpm2_get_capability_pcrs(TPML_PCR_SELECTION *Pcrs) +TPM_RESULT tpm2_get_capability_pcrs(TPML_PCR_SELECTION *Pcrs) { TPMS_CAPABILITY_DATA TpmCap; - int status; + TPM_RESULT status; int index;
status = tlcl_get_capability(TPM_CAP_PCRS, 0, 1, &TpmCap); @@ -115,7 +115,7 @@ * @retval TPM_SUCCESS Operation completed successfully. * @retval TPM_IOERROR Unexpected device behavior. */ -int mboot_hash_extend_log(uint64_t flags, uint8_t *hashData, uint32_t hashDataLen, +TPM_RESULT mboot_hash_extend_log(uint64_t flags, uint8_t *hashData, uint32_t hashDataLen, TCG_PCR_EVENT2_HDR *newEventHdr, uint8_t *eventLog) { TPMT_HA *digest = NULL; @@ -149,7 +149,7 @@ void invalidate_pcrs(void) { int pcr; - int status; + TPM_RESULT status;
TCG_PCR_EVENT2_HDR tcgEventHdr; uint8_t invalidate = 1; @@ -227,10 +227,10 @@ * @retval TPM_SUCCESS Operation completed successfully. * @retval TPM_IOERROR Unexpected device behavior. */ -int mb_measure_log_worker(const char *name, uint32_t type, uint32_t pcr, +TPM_RESULT mb_measure_log_worker(const char *name, uint32_t type, uint32_t pcr, TCG_EVENTTYPE eventType, const char *event_msg) { - int status; + TPM_RESULT status; TCG_PCR_EVENT2_HDR tcgEventHdr; uint8_t *base; size_t size; @@ -271,13 +271,13 @@ * @retval TPM_IOERROR Unexpected device behavior. **/
-int __attribute__((weak)) mb_entry(int wake_from_s3) +TPM_RESULT __attribute__((weak)) mb_entry(int wake_from_s3) { - int status; + TPM_RESULT status;
/* Initialize TPM driver. */ printk(BIOS_DEBUG, "%s: tlcl_lib_init\n", __func__); - if (tlcl_lib_init() != VB2_SUCCESS) { + if (tlcl_lib_init() != TPM_SUCCESS) { printk(BIOS_ERR, "%s: TPM driver initialization failed.\n", __func__); return TPM_IOERROR; } @@ -315,9 +315,9 @@ * @retval TPM_IOERROR Unexpected device behavior. */
-int __attribute__((weak))mb_measure(int wake_from_s3) +TPM_RESULT __attribute__((weak))mb_measure(int wake_from_s3) { - uint32_t status; + TPM_RESULT status;
status = mb_entry(wake_from_s3); if (status == TPM_SUCCESS) { @@ -357,9 +357,9 @@ * @retval TPM_SUCCESS Operation completed successfully. * @retval TPM_IOERROR Unexpected device behavior. */ -int __attribute__((weak))mb_measure_log_start(void) +TPM_RESULT __attribute__((weak))mb_measure_log_start(void) { - int status; + TPM_RESULT status; uint32_t i;
if ((tpm2_get_active_pcrs() & EFI_TCG2_BOOT_HASH_ALG_SHA256) == 0x0) { @@ -414,9 +414,9 @@ * @retval TPM_SUCCESS Operation completed successfully. * @retval TPM_IOERROR Unexpected device behavior. **/ -int __attribute__((weak))mb_crtm(void) +TPM_RESULT __attribute__((weak))mb_crtm(void) { - int status; + TPM_RESULT status; TCG_PCR_EVENT2_HDR tcgEventHdr; uint8_t hash[VB2_SHA256_DIGEST_SIZE]; uint8_t *msgPtr; diff --git a/src/vendorcode/eltan/security/mboot/mboot.h b/src/vendorcode/eltan/security/mboot/mboot.h index 9d906ab..148e66a 100644 --- a/src/vendorcode/eltan/security/mboot/mboot.h +++ b/src/vendorcode/eltan/security/mboot/mboot.h @@ -76,12 +76,12 @@
int is_zero_buffer(void *buffer, unsigned int size);
-int mboot_hash_extend_log(uint64_t flags, uint8_t *hashData, uint32_t hashDataLen, +TPM_RESULT mboot_hash_extend_log(uint64_t flags, uint8_t *hashData, uint32_t hashDataLen, TCG_PCR_EVENT2_HDR *newEventHdr, uint8_t *eventLog);
void mboot_print_buffer(uint8_t *buffer, uint32_t bufferSize);
-int mb_crtm(void); +TPM_RESULT mb_crtm(void);
typedef struct { const char *cbfs_name; @@ -91,18 +91,18 @@ const char *event_msg; } mboot_measure_item_t;
-int mb_measure_log_worker(const char *name, uint32_t type, uint32_t pcr, +TPM_RESULT mb_measure_log_worker(const char *name, uint32_t type, uint32_t pcr, TCG_EVENTTYPE eventType, const char *event_msg);
-int mb_measure_log_start(void); +TPM_RESULT mb_measure_log_start(void); void invalidate_pcrs(void);
EFI_TCG2_EVENT_ALGORITHM_BITMAP tpm2_get_active_pcrs(void);
-int tpm2_get_capability_pcrs(TPML_PCR_SELECTION *Pcrs); +TPM_RESULT tpm2_get_capability_pcrs(TPML_PCR_SELECTION *Pcrs);
-int mb_measure(int wake_from_s3); -int mb_entry(int wake_from_s3); +TPM_RESULT mb_measure(int wake_from_s3); +TPM_RESULT mb_entry(int wake_from_s3);
int log_efi_specid_event(void); int log_event_tcg_20_format(TCG_PCR_EVENT2_HDR *EventHdr, uint8_t *EventLog); diff --git a/src/vendorcode/eltan/security/verified_boot/vboot_check.c b/src/vendorcode/eltan/security/verified_boot/vboot_check.c index 64b5dc5..814422e 100644 --- a/src/vendorcode/eltan/security/verified_boot/vboot_check.c +++ b/src/vendorcode/eltan/security/verified_boot/vboot_check.c @@ -5,6 +5,7 @@ #include <bootmode.h> #include <cbfs.h> #include <fmap_config.h> +#include <security/tpm/tss/common/tss_common.h> #include <vboot_check.h> #include <vboot_common.h> #include <vb2_internals_please_do_not_use.h> @@ -115,10 +116,10 @@ * @retval TPM_SUCCESS Operation completed successfully. * @retval TPM_IOERROR Unexpected device behavior. */ -static int measure_item(uint32_t pcr, uint8_t *hashData, uint32_t hashDataLen, +static TPM_RESULT measure_item(uint32_t pcr, uint8_t *hashData, uint32_t hashDataLen, int8_t *event_msg, TCG_EVENTTYPE eventType) { - int status = TPM_SUCCESS; + TPM_RESULT status = TPM_SUCCESS; TCG_PCR_EVENT2_HDR tcgEventHdr;
memset(&tcgEventHdr, 0, sizeof(tcgEventHdr)); diff --git a/src/vendorcode/google/chromeos/cr50_enable_update.c b/src/vendorcode/google/chromeos/cr50_enable_update.c index 3c77bf3..3faef4e 100644 --- a/src/vendorcode/google/chromeos/cr50_enable_update.c +++ b/src/vendorcode/google/chromeos/cr50_enable_update.c @@ -25,7 +25,7 @@ */ static int cr50_is_reset_needed(void) { - int rc; + TPM_RESULT rc; uint8_t tpm_mode;
rc = tlcl_cr50_get_tpm_mode(&tpm_mode); @@ -83,7 +83,7 @@
static void enable_update(void *unused) { - int rc; + TPM_RESULT rc; int cr50_reset_reqd = 0; uint8_t num_restored_headers;
@@ -97,7 +97,7 @@
rc = tlcl_lib_init();
- if (rc != VB2_SUCCESS) { + if (rc != TPM_SUCCESS) { printk(BIOS_ERR, "tlcl_lib_init() failed for CR50 update: %x\n", rc); return; diff --git a/src/vendorcode/google/chromeos/cse_board_reset.c b/src/vendorcode/google/chromeos/cse_board_reset.c index 229a870..358723b 100644 --- a/src/vendorcode/google/chromeos/cse_board_reset.c +++ b/src/vendorcode/google/chromeos/cse_board_reset.c @@ -13,13 +13,13 @@
void cse_board_reset(void) { - int rc; + TPM_RESULT rc; struct cr50_firmware_version version;
if (CONFIG(TPM2) && CONFIG(TPM_GOOGLE_CR50)) { /* Initialize TPM and get the cr50 firmware version. */ rc = tlcl_lib_init(); - if (rc != VB2_SUCCESS) { + if (rc != TPM_SUCCESS) { printk(BIOS_ERR, "tlcl_lib_init() failed: 0x%x\n", rc); return; } diff --git a/src/vendorcode/google/chromeos/tpm2.c b/src/vendorcode/google/chromeos/tpm2.c index a28b02e..5fe6350 100644 --- a/src/vendorcode/google/chromeos/tpm2.c +++ b/src/vendorcode/google/chromeos/tpm2.c @@ -7,7 +7,7 @@
static void disable_platform_hierarchy(void *unused) { - int rc; + TPM_RESULT rc;
if (!CONFIG(TPM2)) return; @@ -17,7 +17,7 @@
rc = tlcl_lib_init();
- if (rc != VB2_SUCCESS) { + if (rc != TPM_SUCCESS) { printk(BIOS_ERR, "tlcl_lib_init() failed: %x\n", rc); return; }
-
Jon Murphy (Code Review)