mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2025-11-24 18:25:10 +00:00
Port over ContinueSelfTest() fix from firmware
Change-Id: Ib12405f968af11ad75a6429ae9ebe502dde5bf92 BUG=chrome-os-partner:1591 TEST=make && make runtests (This is already in the firmware; I'm just copying it back into vboot reference) Review URL: http://codereview.chromium.org/5312003
This commit is contained in:
@@ -283,7 +283,6 @@ uint32_t RollbackS3Resume(void) {
|
||||
* environment, don't even talk to the TPM. */
|
||||
TlclLibInit();
|
||||
TlclResume();
|
||||
TlclContinueSelfTest();
|
||||
#endif
|
||||
return TPM_SUCCESS;
|
||||
}
|
||||
@@ -341,16 +340,10 @@ uint32_t RollbackS3Resume(void) {
|
||||
result = TlclResume();
|
||||
if (result == TPM_E_INVALID_POSTINIT) {
|
||||
/* We're on a platform where the TPM maintains power in S3, so
|
||||
it's already initialized. No need for a self-test. */
|
||||
it's already initialized. */
|
||||
return TPM_SUCCESS;
|
||||
}
|
||||
if (result != TPM_SUCCESS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
RETURN_ON_FAILURE(TlclContinueSelfTest());
|
||||
|
||||
return TPM_SUCCESS;
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user