Pass VbSharedData between LoadFirmware() and LoadKernel()

firmware/include/load_kernel_fw.h

-/* Copyright (c) 2010-2011 The Chromium OS Authors. All rights reserved.
+/* 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.
  *
  * High-level firmware API for loading and verifying kernel.
  * (Firmware Portion)
  */
 
 #ifndef VBOOT_REFERENCE_LOAD_KERNEL_FW_H_
 #define VBOOT_REFERENCE_LOAD_KERNEL_FW_H_
 
@@ skipping 15 matching lines @@
 #define BOOT_FLAG_DEVELOPER UINT64_C(0x01)
 /* In recovery mode */
 #define BOOT_FLAG_RECOVERY  UINT64_C(0x02)
 /* Skip check of kernel buffer address */
 #define BOOT_FLAG_SKIP_ADDR_CHECK UINT64_C(0x04)
 /* Active main firmware is developer-type, not normal-type or recovery-type. */
 #define BOOT_FLAG_DEV_FIRMWARE UINT64_C(0x08)
 
 typedef struct LoadKernelParams {
   /* Inputs to LoadKernel() */
-  void* header_sign_key_blob;   /* Key blob used to sign the kernel header */
+  void* shared_data_blob;       /* Buffer for data shared between
+                                 * LoadFirmware() and LoadKernel().  Pass the
+                                 * same buffer which was passed to
+                                 * LoadFirmware(). */
+  uint64_t shared_data_size;    /* Size of shared data blob buffer, in bytes.
+                                 * On output, this will contain the actual

[Bill Richardson, 2011/03/09 20:52:20]

Isn't shared_data_size an input only? Don't we get this from LoadFirmware() ?
Why would it change?

[Randall Spangler, 2011/03/09 21:11:35]

In recovery mode, LoadKernel() will still use the buffer to report timing
information.  I'll comment this.

+                                 * data size placed into the buffer. */
+  void* gbb_data;               /* Pointer to GBB data */
+  uint64_t gbb_size;            /* Size of GBB data in bytes */
   uint64_t bytes_per_lba;       /* Bytes per lba sector on current device */
   uint64_t ending_lba;          /* Last addressable lba sector on current
                                  * device */
   void* kernel_buffer;          /* Destination buffer for kernel
                                  * (normally at 0x100000) */
   uint64_t kernel_buffer_size;  /* Size of kernel buffer in bytes */
   uint64_t boot_flags;          /* Boot flags */
   VbNvContext* nv_context;       /* Context for NV storage.  nv_context->raw
                                   * must be filled before calling
                                   * LoadKernel().  On output, check
@@ skipping 24 matching lines @@
                                  * LoadKernel() in
                                  * LoadKernelParams.partition_number */
   uint64_t original_address;    /* Absolute bootloader start adddress,
                                  * as returned from LoadKernel() in
                                  * LoadKernelParams.bootloader_start */
   uint8_t  partition_guid[16];  /* UniquePartitionGuid for boot partition */
 } KernelBootloaderOptions;
 
 
 #endif  /* VBOOT_REFERENCE_LOAD_KERNEL_FW_H_ */