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

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 297 matching lines @@
   return TPM_SUCCESS;
 }
 
 uint32_t RollbackKernelLock(void) {
   return TPM_SUCCESS;
 }
 
 #else
 
 uint32_t RollbackS3Resume(void) {
+  uint32_t result;
   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
   /* TODO: ContinueSelfTest() should be faster than SelfTestFull, but
    * may also not work properly in older TPM firmware.  For now, do
    * the full self test. */
   RETURN_ON_FAILURE(TlclContinueSelfTest());
 #else
   RETURN_ON_FAILURE(TlclSelfTestFull());
 #endif
   return TPM_SUCCESS;
 }
@@ skipping 86 matching lines @@
 
 uint32_t RollbackKernelLock(void) {
   if (g_rollback_recovery_mode) {
     return TPM_SUCCESS;
   } else {
     return TlclLockPhysicalPresence();
   }
 }
 
 #endif // DISABLE_ROLLBACK_TPM