Enable TPM in developer mode again.

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 212 matching lines @@
   } else if (kernel_versions < backup_versions) {
     /* This cannot happen.  We're screwed. */
     return TPM_E_INTERNAL_INCONSISTENCY;
   }
   RETURN_ON_FAILURE(SafeWrite(KERNEL_VERSIONS_BACKUP_NV_INDEX,
                               (uint8_t*) &kernel_versions, sizeof(uint32_t)));
   return TPM_SUCCESS;
 }
 
 /* Checks for transitions between protected mode to developer mode.  When going
- * into developer mode, clear the TPM.
+ * into or out of developer mode, clear the TPM.
  */
 static uint32_t CheckDeveloperModeTransition(uint32_t current_developer) {
   uint32_t past_developer;
   RETURN_ON_FAILURE(TlclRead(DEVELOPER_MODE_NV_INDEX,
                              (uint8_t*) &past_developer,
                              sizeof(past_developer)));
   if (past_developer != current_developer) {
     RETURN_ON_FAILURE(TPMClearAndReenable());
     RETURN_ON_FAILURE(SafeWrite(DEVELOPER_MODE_NV_INDEX,
                                 (uint8_t*) &current_developer,
@@ skipping 86 matching lines @@
 #ifdef DISABLE_ROLLBACK_TPM
 
 /* Dummy implementations which don't support TPM rollback protection */
 
 uint32_t RollbackFirmwareSetup(int developer_mode) {
 #ifndef CHROMEOS_ENVIRONMENT
   /* Initialize the TPM, but ignore return codes.  In ChromeOS
    * environment, don't even talk to the TPM. */
   TlclLibInit();
   TlclStartup();
+  TlclSelfTestFull();

[semenzato, 2010/08/05 19:50:53]

This has changed a lot and I don't understand why it's not calling SetupTPM. 
Maybe we can talk.

 #endif
   return TPM_SUCCESS;
 }
 
 uint32_t RollbackFirmwareRead(uint16_t* key_version, uint16_t* version) {
   *key_version = *version = 0;
   return TPM_SUCCESS;
 }
 
 uint32_t RollbackFirmwareWrite(uint16_t key_version, uint16_t version) {
   return TPM_SUCCESS;
 }
 
 uint32_t RollbackFirmwareLock(void) {
   return TPM_SUCCESS;
 }
 
 uint32_t RollbackKernelRecovery(int developer_mode) {
 #ifndef CHROMEOS_ENVIRONMENT
   /* Initialize the TPM, but ignore return codes.  In ChromeOS
    * environment, don't even talk to the TPM. */
   TlclLibInit();
   TlclStartup();
+  TlclSelfTestFull();
 #endif
   return TPM_SUCCESS;
 }
 
 uint32_t RollbackKernelRead(uint16_t* key_version, uint16_t* version) {
   *key_version = *version = 0;
   return TPM_SUCCESS;
 }
 
 uint32_t RollbackKernelWrite(uint16_t key_version, uint16_t version) {
@@ skipping 76 matching lines @@
 
 uint32_t RollbackKernelLock(void) {
   if (!g_rollback_recovery_mode) {
     return TlclLockPhysicalPresence();
   } else {
     return TPM_SUCCESS;
   }
 }
 
 #endif // DISABLE_ROLLBACK_TPM