Port over ContinueSelfTest() fix from firmware

firmware/lib/rollback_index.c

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Functions for querying, manipulating and locking rollback indices
  * stored in the TPM NVRAM.
  */
 
 #include "rollback_index.h"
 
@@ skipping 265 matching lines @@
 #ifdef DISABLE_ROLLBACK_TPM
 
 /* Dummy implementations which don't support TPM rollback protection */
 
 uint32_t RollbackS3Resume(void) {
 #ifndef CHROMEOS_ENVIRONMENT
   /* Initialize the TPM, but ignore return codes.  In ChromeOS
    * environment, don't even talk to the TPM. */
   TlclLibInit();
   TlclResume();
-  TlclContinueSelfTest();
 #endif
   return TPM_SUCCESS;
 }
 
 uint32_t RollbackFirmwareSetup(int developer_mode, uint32_t* version) {
 #ifndef CHROMEOS_ENVIRONMENT
   /* Initializes the TPM, but ignores return codes.  In ChromeOS
    * environment, doesn't even talk to the TPM. */
   TlclLibInit();
   TlclStartup();
@@ skipping 37 matching lines @@
 }
 
 #else
 
 uint32_t RollbackS3Resume(void) {
   uint32_t result;
   TlclLibInit();
   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;
 }
 
 
 uint32_t RollbackFirmwareSetup(int developer_mode, uint32_t* version) {
   RollbackSpaceFirmware rsf;
   uint8_t out_digest[20];  /* For PCR extend output */
 
   RETURN_ON_FAILURE(SetupTPM(0, developer_mode, &rsf));
   *version = rsf.fw_versions;
   VBDEBUG(("TPM: RollbackFirmwareSetup %x\n", (int)rsf.fw_versions));
@@ skipping 82 matching lines @@
 
 uint32_t RollbackKernelLock(void) {
   if (g_rollback_recovery_mode) {
     return TPM_SUCCESS;
   } else {
     return TlclLockPhysicalPresence();
   }
 }
 
 #endif // DISABLE_ROLLBACK_TPM