Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1068)

Side by Side Diff: firmware/include/vboot_struct.h

Issue 6685075: Add TPM version checking (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/vboot_reference.git@master
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | firmware/lib/include/rollback_index.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright (c) 2011 The Chromium OS Authors. All rights reserved. 1 /* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. 3 * found in the LICENSE file.
4 * 4 *
5 * Data structure definitions for verified boot, for on-disk / in-eeprom 5 * Data structure definitions for verified boot, for on-disk / in-eeprom
6 * data. 6 * data.
7 */ 7 */
8 8
9 #ifndef VBOOT_REFERENCE_VBOOT_STRUCT_H_ 9 #ifndef VBOOT_REFERENCE_VBOOT_STRUCT_H_
10 #define VBOOT_REFERENCE_VBOOT_STRUCT_H_ 10 #define VBOOT_REFERENCE_VBOOT_STRUCT_H_
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 uint64_t timer_load_firmware_start_exit; /* LoadFirmwareStart() - exit */ 197 uint64_t timer_load_firmware_start_exit; /* LoadFirmwareStart() - exit */
198 uint64_t timer_load_firmware_enter; /* LoadFirmware() - enter */ 198 uint64_t timer_load_firmware_enter; /* LoadFirmware() - enter */
199 uint64_t timer_load_firmware_exit; /* LoadFirmware() - exit */ 199 uint64_t timer_load_firmware_exit; /* LoadFirmware() - exit */
200 uint64_t timer_load_kernel_enter; /* LoadKernel() - enter */ 200 uint64_t timer_load_kernel_enter; /* LoadKernel() - enter */
201 uint64_t timer_load_kernel_exit; /* LoadKernel() - exit */ 201 uint64_t timer_load_kernel_exit; /* LoadKernel() - exit */
202 202
203 uint8_t check_fw_a_result; /* Result of checking RW firmware A */ 203 uint8_t check_fw_a_result; /* Result of checking RW firmware A */
204 uint8_t check_fw_b_result; /* Result of checking RW firmware B */ 204 uint8_t check_fw_b_result; /* Result of checking RW firmware B */
205 uint8_t firmware_index; /* Firmware index returned by 205 uint8_t firmware_index; /* Firmware index returned by
206 * LoadFirmware() or 0xFF if failure */ 206 * LoadFirmware() or 0xFF if failure */
207 uint32_t fw_version_tpm_start; /* Firmware TPM version at start */ 207 uint32_t fw_version_tpm_start; /* Firmware TPM version at start of
208 * LoadFirmware() */
208 uint32_t fw_version_lowest; /* Firmware lowest version found */ 209 uint32_t fw_version_lowest; /* Firmware lowest version found */
209 210
211 uint32_t fw_version_tpm; /* Current firmware version in TPM */
212 uint32_t kernel_version_tpm; /* Current kernel version in TPM */
213
210 /* After read-only firmware which uses version 1 is released, any additional 214 /* After read-only firmware which uses version 1 is released, any additional
211 * fields must be added below, and the struct version must be increased. 215 * fields must be added below, and the struct version must be increased.
212 * Before reading/writing those fields, make sure that the struct being 216 * Before reading/writing those fields, make sure that the struct being
213 * accessed is at least version 2. 217 * accessed is at least version 2.
214 * 218 *
215 * It's always ok for an older firmware to access a newer struct, since all 219 * It's always ok for an older firmware to access a newer struct, since all
216 * the fields it knows about are present. Newer firmware needs to use 220 * the fields it knows about are present. Newer firmware needs to use
217 * reasonable defaults when accessing older structs. */ 221 * reasonable defaults when accessing older structs. */
218 222
219 } __attribute__((packed)) VbSharedDataHeader; 223 } __attribute__((packed)) VbSharedDataHeader;
220 224
221 #define VB_SHARED_DATA_VERSION 1 /* Version for struct_version */ 225 #define VB_SHARED_DATA_VERSION 1 /* Version for struct_version */
222 226
223 __pragma(pack(pop)) /* Support packing for MSVC. */ 227 __pragma(pack(pop)) /* Support packing for MSVC. */
224 228
225 #endif /* VBOOT_REFERENCE_VBOOT_STRUCT_H_ */ 229 #endif /* VBOOT_REFERENCE_VBOOT_STRUCT_H_ */
OLDNEW
« no previous file with comments | « no previous file | firmware/lib/include/rollback_index.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698