Add ForceClear also on dev->normal transitions. Fix wrong API description.

vboot_firmware/include/rollback_index.h

 /* 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.
  */
 
 #ifndef VBOOT_REFERENCE_ROLLBACK_INDEX_H_
 #define VBOOT_REFERENCE_ROLLBACK_INDEX_H_
@@ skipping 29 matching lines @@
 #define KERNEL_SPACE_SIZE (sizeof(uint32_t) + KERNEL_SPACE_UID_SIZE)
 
 /* All functions return TPM_SUCCESS (zero) if successful, non-zero if error */
 
 /* SetupTPM is called on boot and on starting the RW firmware, passing the
  * appripriate MODE and DEVELOPER_FLAG parameters.  MODE can be one of
  * RO_RECOVERY_MODE, RO_NORMAL_MODE, RW_NORMAL_MODE.  DEVELOPER_FLAG is 1 when
  * the developer switch is ON, 0 otherwise.
  *
  * If SetupTPM returns TPM_SUCCESS, the caller may proceed.  If it returns
- * TPM_E_MUST_REBOOT, the caller must reboot in normal mode.  For all other
- * return values, the caller must reboot in recovery mode.
+ * TPM_E_MUST_REBOOT, the caller must reboot in the current mode.  For all
+ * other return values, the caller must reboot in recovery mode.
  *
  * This function has many side effects on the TPM state.  In particular, when
- * called with mode = RECOVERY_MODE it locks the firmware versions before
+ * called with mode = RECOVERY_MODE, it locks the firmware versions before
  * returning.  In all other cases, the caller is responsible for locking the
  * firmware versions once it decides it doesn't need to update them.
  */
 uint32_t SetupTPM(int mode, int developer_flag);
 uint32_t GetStoredVersions(int type, uint16_t* key_version, uint16_t* version);
 uint32_t WriteStoredVersions(int type, uint16_t key_version, uint16_t version);
 uint32_t LockFirmwareVersions(void);
 uint32_t LockKernelVersionsByLockingPP(void);
 
 #endif  /* VBOOT_REFERENCE_ROLLBACK_INDEX_H_ */