Fix normal/recovery mode, and RO firmware vs. RW firmware behavior.

vboot_firmware/lib/vboot_firmware.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.
  *
  * High-level firmware API for loading and verifying rewritable firmware.
  * (Firmware portion)
  */
 
 #include "vboot_firmware.h"
 
@@ skipping 22 matching lines @@
   /* Clear output params in case we fail */
   params->firmware_index = 0;
   params->kernel_sign_key_blob = NULL;
   params->kernel_sign_key_size = 0;
 
   /* Must have a root key */
   if (!root_key)
     return LOAD_FIRMWARE_RECOVERY;
 
   /* Initialize the TPM and read rollback indices. */
-  if (0 != SetupTPM() )
+  /* TODO: fix SetupTPM parameter */

[gauravsh, 2010/06/14 10:57:53]

fix parameter how?

+  if (0 != SetupTPM(0, 0) )
     return LOAD_FIRMWARE_RECOVERY;
   if (0 != GetStoredVersions(FIRMWARE_VERSIONS,
                              &tpm_key_version, &tpm_fw_version))
     return LOAD_FIRMWARE_RECOVERY;
 
   /* Loop over indices */
   for (index = 0; index < 2; index++) {
     VbKeyBlockHeader* key_block;
     uint64_t vblock_size;
     VbFirmwarePreambleHeader* preamble;
@@ skipping 110 matching lines @@
     /* Lock Firmware TPM rollback indices from further writes.  In
      * this design, this is done by setting the globalLock bit, which
      * is cleared only by TPM_Init at reboot.  */
     if (0 != LockFirmwareVersions())
       return LOAD_FIRMWARE_RECOVERY;
   }
 
   /* If we're still here, no good firmware, so go to recovery mode. */
   return LOAD_FIRMWARE_RECOVERY;
 }