Enable TPM in developer mode again.

firmware/lib/tpm_lite/tlcl.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.
  */
 
 /* A lightweight TPM command library.
  *
  * The general idea is that TPM commands are array of bytes whose
  * fields are mostly compile-time constant.  The goal is to build much
  * of the commands at compile time (or build time) and change some of
  * the fields at run time as needed.  The code in
  * utility/tlcl_generator.c builds structures containing the commands,
  * as well as the offsets of the fields that need to be set at run
  * time.
  */
 
 #include "sysincludes.h"
 #include "tlcl.h"
 #include "tlcl_internal.h"
 #include "tlcl_structures.h"
 #include "tss_constants.h"
 #include "utility.h"
 
-#define EXTRA_LOGGING 0
-
-#if EXTRA_LOGGING
-#include <stdio.h>
-#endif
-
 /* Sets the size field of a TPM command. */
 static INLINE void SetTpmCommandSize(uint8_t* buffer, uint32_t size) {
   ToTpmUint32(buffer + sizeof(uint16_t), size);
 }
 
 /* Gets the size field of a TPM command. */
 POSSIBLY_UNUSED static INLINE int TpmCommandSize(const uint8_t* buffer) {
   uint32_t size;
   FromTpmUint32(buffer + sizeof(uint16_t), &size);
   return (int) size;
@@ skipping 20 matching lines @@
       VBDEBUG(("TPM: command 0x%x failed: 0x%x\n", command, result));
     else
       error("TPM: command 0x%x failed: 0x%x\n", command, result);
   }
 }
 
 /* Sends a TPM command and gets a response. */
 static void TlclSendReceive(uint8_t* request, uint8_t* response,
                             int max_length) {
 
-#if EXTRA_LOGGING
-  printf("command: %x%x %x%x%x%x %x%x%x%x\n",
-         request[0], request[1],
-         request[2], request[3], request[4], request[5],
-         request[6], request[7], request[8], request[9]);
+#ifdef EXTRA_LOGGING

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

We should do something about VBDEBUG when compiling for user-level execution. 
Right now it does nothing, but I'd like to see those messages.

Also, you don't like #if instead of #ifdef?  The advantage of #if is that the
variable must always be defined, which makes it easier for the next programmer
to figure out WHERE to define it.

+  VBDEBUG(("TPM: command: %x%x %x%x%x%x %x%x%x%x\n",
+           request[0], request[1],
+           request[2], request[3], request[4], request[5],
+           request[6], request[7], request[8], request[9]));
 #endif
+
   TlclStubSendReceive(request, TpmCommandSize(request),
                       response, max_length);
-#if EXTRA_LOGGING
-  printf("response: %x%x %x%x%x%x %x%x%x%x\n",
-         response[0], response[1],
-         response[2], response[3], response[4], response[5],
-         response[6], response[7], response[8], response[9]);
+
+#ifdef EXTRA_LOGGING
+  VBDEBUG(("TPM: response: %x%x %x%x%x%x %x%x%x%x\n",
+           response[0], response[1],
+           response[2], response[3], response[4], response[5],
+           response[6], response[7], response[8], response[9]));
 #endif
 
 #ifdef VBOOT_DEBUG
   {
     int command = TpmCommandCode(request);
     int result = TpmReturnCode(response);
     VBDEBUG(("TPM: command 0x%x returned 0x%x\n", command, result));
   }
 #endif
 }
@@ skipping 199 matching lines @@
   ToTpmUint32(cmd.buffer + tpm_getpermissions_cmd.index, index);
   TlclSendReceive(cmd.buffer, response, sizeof(response));
   result = TpmReturnCode(response);
   if (result != TPM_SUCCESS) {
     return result;
   }
   nvdata = response + kTpmResponseHeaderLength + sizeof(size);
   FromTpmUint32(nvdata + kNvDataPublicPermissionsOffset, permissions);
   return result;
 }