scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-30 21:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bail out from S3Resume if TPM was not power-cycled.

Browse Source 
Change-Id: I80027a5a935e13ba37e24978dd4b0c6040d66728

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/3298010
This commit is contained in:
Luigi Semenzato
2010-09-07 09:56:19 -07:00
parent 1cd4cdbbae
commit 9828594eaa
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/lib/rollback_index.c
View File

@@ -315,8 +315,18 @@ uint32_t RollbackKernelLock(void) {
#else #else
uint32_t RollbackS3Resume(void) { uint32_t RollbackS3Resume(void) {
uint32_t result;
TlclLibInit(); TlclLibInit();
RETURN_ON_FAILURE(TlclResume()); /* Check for INVALID_POSTINIT error, so we don't have to worry if this ends
* up in hardware that keeps the TPM powered on during S3.
*/
result = TlclResume();
if (result == TPM_E_INVALID_POSTINIT) {
return TPM_SUCCESS;
}
if (result != TPM_SUCCESS) {
return result;
}
#ifdef USE_CONTINUE_SELF_TEST #ifdef USE_CONTINUE_SELF_TEST
/* TODO: ContinueSelfTest() should be faster than SelfTestFull, but /* TODO: ContinueSelfTest() should be faster than SelfTestFull, but
* may also not work properly in older TPM firmware. For now, do * may also not work properly in older TPM firmware. For now, do

2
firmware/version.c
View File

@@ -1 +1 @@
char* VbootVersion = "VBOOv=54e1e8b5"; char* VbootVersion = "VBOOv=c4585ee1";