Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: firmware/lib/rollback_index.c

Issue 5312003: Port over ContinueSelfTest() fix from firmware (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/vboot_reference.git@master
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | firmware/version.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: firmware/lib/rollback_index.c
diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c
index ba6e21c06fee25a835e6939d8cfeb0e51cfc30d8..766b62e263144ad65652003c86503ed6751dc437 100644
--- a/firmware/lib/rollback_index.c
+++ b/firmware/lib/rollback_index.c
@@ -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;
}
« no previous file with comments | « no previous file | firmware/version.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698