Move initialization of g_recovery_mode.

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 166 matching lines @@
                   RollbackSpaceFirmware* rsf) {
 
   int rsf_dirty = 0;
   uint8_t new_flags = 0;
   uint8_t disable;
   uint8_t deactivated;
   uint32_t result;
 
   VBDEBUG(("TPM: SetupTPM(r%d, d%d)\n", recovery_mode, developer_mode));
 
+  if (recovery_mode)
+    g_rollback_recovery_mode = 1;  /* Global variables are usable in
+                                    * recovery mode */
+
   /* TODO: TlclLibInit() should be able to return failure */
   TlclLibInit();
 
   RETURN_ON_FAILURE(TlclStartup());
   /* Use ContinueSelfTest rather than SelfTestFull().  It enables
    * access to the subset of TPM commands we need in the firmware, and
    * allows the full self test to run in paralle with firmware
    * startup.  By the time we get to the OS, self test will have
    * completed. */
   RETURN_ON_FAILURE(TlclContinueSelfTest());
@@ skipping 37 matching lines @@
   /* Clears ownership if developer flag has toggled */
   if ((developer_mode ? FLAG_LAST_BOOT_DEVELOPER : 0) !=
       (rsf->flags & FLAG_LAST_BOOT_DEVELOPER)) {
     VBDEBUG(("TPM: Developer flag changed; clearing owner.\n"));
     RETURN_ON_FAILURE(TPMClearAndReenable());
   }
 
   /* Updates flags */
   if (developer_mode)
     new_flags |= FLAG_LAST_BOOT_DEVELOPER;
-  if (recovery_mode)
-    g_rollback_recovery_mode = 1;  /* Global variables are usable in
-                                    * recovery mode */
-
   if (rsf->flags != new_flags) {
     rsf->flags = new_flags;
     rsf_dirty = 1;
   }
 
   /* If firmware space is dirty, this flushes it back to the TPM */
   if (rsf_dirty) {
     VBDEBUG(("TPM: Updating firmware space.\n"));
     RETURN_ON_FAILURE(WriteSpaceFirmware(rsf));
   }
@@ skipping 174 matching lines @@
 
 uint32_t RollbackKernelLock(void) {
   if (g_rollback_recovery_mode) {
     return TPM_SUCCESS;
   } else {
     return TlclLockPhysicalPresence();
   }
 }
 
 #endif // DISABLE_ROLLBACK_TPM