From 44f34b51951eaf90be5d5d87f43c459b8b4e3094 Mon Sep 17 00:00:00 2001
From: Randall Spangler <rspangler@chromium.org>
Date: Tue, 23 Nov 2010 14:17:21 -0800
Subject: [PATCH] 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
---
 firmware/lib/rollback_index.c | 11 ++---------
 firmware/version.c            |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c
index ba6e21c06f..766b62e263 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;
 }
 
 
diff --git a/firmware/version.c b/firmware/version.c
index 44778c89d0..836810d00f 100644
--- a/firmware/version.c
+++ b/firmware/version.c
@@ -1 +1 @@
-char* VbootVersion = "VBOOv=e30e3fe5";
+char* VbootVersion = "VBOOv=f66e9197";