diff options
author | Luigi Semenzato <semenzato@google.com> | 2011-03-16 17:33:23 -0700 |
---|---|---|
committer | Luigi Semenzato <semenzato@google.com> | 2011-03-16 17:33:23 -0700 |
commit | 06fbb168ac49dd63f427beb3907f3c129d81bf84 (patch) | |
tree | 06e0ae97f99f8a4a7f476b815329781077d83bd1 /firmware/lib/tpm_lite/tlcl.c | |
parent | 050785c31210176e0a6202e320a02afc21c2640b (diff) | |
download | vboot-06fbb168ac49dd63f427beb3907f3c129d81bf84.tar.gz |
Move ContinueSelfTest to a later point to save time.
Change-Id: I96b413438359e11315101d408033066e6f0a0981
BUG=chrome-os-partner: 1826
TEST=none
Review URL: http://codereview.chromium.org/6667051
Diffstat (limited to 'firmware/lib/tpm_lite/tlcl.c')
-rw-r--r-- | firmware/lib/tpm_lite/tlcl.c | 49 |
1 files changed, 43 insertions, 6 deletions
diff --git a/firmware/lib/tpm_lite/tlcl.c b/firmware/lib/tpm_lite/tlcl.c index 6252700d..f36f4633 100644 --- a/firmware/lib/tpm_lite/tlcl.c +++ b/firmware/lib/tpm_lite/tlcl.c @@ -44,11 +44,11 @@ static INLINE int TpmReturnCode(const uint8_t* buffer) { return TpmCommandCode(buffer); } -/* Sends a TPM command and gets a response. Returns 0 if success or the TPM - * error code if error. */ -static uint32_t TlclSendReceive(const uint8_t* request, uint8_t* response, - int max_length) { - +/* Like TlclSendReceive below, but do not retry if NEEDS_SELFTEST or + * DOING_SELFTEST errors are returned. + */ +static uint32_t TlclSendReceiveNoRetry(const uint8_t* request, + uint8_t* response, int max_length) { uint32_t result; #ifdef EXTRA_LOGGING @@ -83,6 +83,40 @@ static uint32_t TlclSendReceive(const uint8_t* request, uint8_t* response, } +/* Sends a TPM command and gets a response. Returns 0 if success or the TPM + * error code if error. In the firmware, waits for the self test to complete + * if needed. In the host, reports the first error without retries. */ +static uint32_t TlclSendReceive(const uint8_t* request, uint8_t* response, + int max_length) { + uint32_t result = TlclSendReceiveNoRetry(request, response, max_length); + /* When compiling for the firmware, hide command failures due to the self + * test not having run or completed. */ +#ifndef CHROMEOS_ENVIRONMENT + /* If the command fails because the self test has not completed, try it + * again after attempting to ensure that the self test has completed. */ + if (result == TPM_E_NEEDS_SELFTEST || result == TPM_E_DOING_SELFTEST) { + result = TlclContinueSelfTest(); + if (result != TPM_SUCCESS) { + return result; + } +#if defined(TPM_BLOCKING_CONTINUESELFTEST) || defined(VB_RECOVERY_MODE) + /* Retry only once */ + result = TlclSendReceiveNoRetry(request, response, max_length); +#else + /* This needs serious testing. The TPM specification says: "iii. The + * caller MUST wait for the actions of TPM_ContinueSelfTest to complete + * before reissuing the command C1." But, if ContinueSelfTest is + * non-blocking, how do we know that the actions have completed other than + * trying again? */ + do { + result = TlclSendReceiveNoRetry(request, response, max_length); + } while (result == TPM_E_DOING_SELFTEST); +#endif + } +#endif /* ! defined(CHROMEOS_ENVIRONMENT) */ + return result; +} + /* Sends a command and returns the error code. */ static uint32_t Send(const uint8_t* command) { uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE]; @@ -116,8 +150,11 @@ uint32_t TlclSelfTestFull(void) { } uint32_t TlclContinueSelfTest(void) { + uint8_t response[TPM_LARGE_ENOUGH_COMMAND_SIZE]; VBDEBUG(("TPM: Continue self test\n")); - return Send(tpm_continueselftest_cmd.buffer); + /* Call the No Retry version of SendReceive to avoid recursion. */ + return TlclSendReceiveNoRetry(tpm_continueselftest_cmd.buffer, + response, sizeof(response)); } uint32_t TlclDefineSpace(uint32_t index, uint32_t perm, uint32_t size) { |