Print LoadKernel() debug data from VbSharedData

firmware/include/vboot_struct.h

 /* Copyright (c) 2011 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.
  *
  * Data structure definitions for verified boot, for on-disk / in-eeprom
  * data.
  */
 
 #ifndef VBOOT_REFERENCE_VBOOT_STRUCT_H_
 #define VBOOT_REFERENCE_VBOOT_STRUCT_H_
@@ skipping 185 matching lines @@
 
 
 /* Information about a single kernel partition check in LoadKernel() */
 typedef struct VbSharedDataKernelPart {
   uint64_t sector_start;              /* Start sector of partition */
   uint64_t sector_count;              /* Sector count of partition */
   uint32_t combined_version;          /* Combined key+kernel version */
   uint8_t gpt_index;                  /* Index of partition in GPT */
   uint8_t check_result;               /* Check result; see VBSD_LKP_CHECK_* */
   uint8_t flags;                      /* Flags (see VBSD_LKP_FLAG_* */
+  uint8_t reserved0;                  /* Reserved */

[stefanreinauer, 2011/03/18 21:39:46]

maybe a comment that this is for padding would be nice

 } VbSharedDataKernelPart;
 
 /* Number of kernel partitions to track per call.  Must be power of 2. */
 #define VBSD_MAX_KERNEL_PARTS 8
 
 /* Flags for VbSharedDataKernelCall.flags */
 /* Error initializing TPM in recovery mode */
 #define VBSD_LK_FLAG_REC_TPM_INIT_ERROR 0x00000001
 
 /* Result codes for VbSharedDataKernelCall.check_result */
@@ skipping 11 matching lines @@
                                        * LoadKernelParams.boot_flags */
   uint32_t flags;                     /* Debug flags; see VBSD_LK_FLAG_* */
   uint64_t sector_count;              /* Number of sectors on drive */
   uint32_t sector_size;               /* Sector size in bytes */
   uint8_t check_result;               /* Check result; see VBSD_LKC_CHECK_* */
   uint8_t boot_mode;                  /* Boot mode for LoadKernel(); see
                                        * VBSD_LK_BOOT_MODE_* constants */
   uint8_t test_error_num;             /* Test error number, if non-zero */
   uint8_t return_code;                /* Return code from LoadKernel() */
   uint8_t kernel_parts_found;         /* Number of kernel partitions found */
+  uint8_t reserved0[7];               /* Reserved */

[stefanreinauer, 2011/03/18 21:39:46]

ditto

   VbSharedDataKernelPart parts[VBSD_MAX_KERNEL_PARTS]; /* Data on kernels */
 } VbSharedDataKernelCall;
 
 /* Number of kernel calls to track.  Must be power of 2. */
 #define VBSD_MAX_KERNEL_CALLS 4
 
 /* Data shared between LoadFirmware(), LoadKernel(), and OS.
  *
  * The boot process is:
  *   1) Caller allocates buffer, at least VB_SHARED_DATA_MIN bytes, ideally
  *      VB_SHARED_DATA_REC_SIZE bytes.
  *   2) If non-recovery boot, this is passed to LoadFirmware(), which
  *      initializes the buffer, adding this header and some data.
  *   3) Buffer is passed to LoadKernel().  If this is a recovery boot,
  *      LoadKernel() initializes the buffer, adding this header.  Regardless
  *      of boot type, LoadKernel() adds some data to the buffer.
  *   4) Caller makes data available to the OS in a platform-dependent manner.
  *      For example, via ACPI or ATAGs. */
 typedef struct VbSharedDataHeader {
   /* Fields present in version 1 */
   uint32_t magic;                     /* Magic number for struct
                                        * (VB_SHARED_DATA_MAGIC) */
   uint32_t struct_version;            /* Version of this structure */
   uint64_t struct_size;               /* Size of this structure in bytes */
   uint64_t data_size;                 /* Size of shared data buffer in bytes */
   uint64_t data_used;                 /* Amount of shared data used so far */
   uint32_t flags;                     /* Flags */
+  uint32_t reserved0;                 /* Reserved */
 
   VbPublicKey kernel_subkey;          /* Kernel subkey, from firmware */
   uint64_t kernel_subkey_data_offset; /* Offset of kernel subkey data from
                                        * start of this struct */
   uint64_t kernel_subkey_data_size;   /* Size of kernel subkey data */
 
   /* Timer values from VbGetTimer().  Unused values are set to 0.  If a
    * function is called mutiple times, these are the times from the
    * most recent call. */
   uint64_t timer_load_firmware_start_enter;  /* LoadFirmwareStart() - enter */
   uint64_t timer_load_firmware_start_exit;   /* LoadFirmwareStart() - exit */
   uint64_t timer_load_firmware_enter;        /* LoadFirmware() - enter */
   uint64_t timer_load_firmware_exit;         /* LoadFirmware() - exit */
   uint64_t timer_load_kernel_enter;          /* LoadKernel() - enter */
   uint64_t timer_load_kernel_exit;           /* LoadKernel() - exit */
 
   /* Information stored in TPM, as retrieved by firmware */
   uint32_t fw_version_tpm;            /* Current firmware version in TPM */
   uint32_t kernel_version_tpm;        /* Current kernel version in TPM */
 
   /* Debugging information from LoadFirmware() */
   uint8_t check_fw_a_result;          /* Result of checking RW firmware A */
   uint8_t check_fw_b_result;          /* Result of checking RW firmware B */
   uint8_t firmware_index;             /* Firmware index returned by
                                        * LoadFirmware() or 0xFF if failure */
+  uint8_t reserved1;                  /* Reserved */
   uint32_t fw_version_tpm_start;      /* Firmware TPM version at start of
                                        * LoadFirmware() */
   uint32_t fw_version_lowest;         /* Firmware lowest version found */
 
   /* Debugging information from LoadKernel() */
   uint32_t lk_call_count;             /* Number of times LoadKernel() called */
   VbSharedDataKernelCall lk_calls[VBSD_MAX_KERNEL_CALLS];  /* Info on calls */
 
   /* Offset and size of supplemental kernel data.  Reserve space for these
    * fields now, so that future LoadKernel() versions can store information
@@ skipping 12 matching lines @@
    * the fields it knows about are present.  Newer firmware needs to use
    * reasonable defaults when accessing older structs. */
 
 } __attribute__((packed)) VbSharedDataHeader;
 
 #define VB_SHARED_DATA_VERSION 1      /* Version for struct_version */
 
 __pragma(pack(pop)) /* Support packing for MSVC. */
 
 #endif  /* VBOOT_REFERENCE_VBOOT_STRUCT_H_ */