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

Unified Diff: firmware/include/vboot_struct.h

Issue 6685068: Add VbSharedData field parsing (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/vboot_reference.git@master
Patch Set: Print flags as hex 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « firmware/include/load_firmware_fw.h ('k') | firmware/lib/vboot_common.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: firmware/include/vboot_struct.h
diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h
index bb47403bb855497743894795a82a13823a181d8d..f43642740a18b6f2ad0f559b72c2903ba9f7ac11 100644
--- a/firmware/include/vboot_struct.h
+++ b/firmware/include/vboot_struct.h
@@ -131,10 +131,38 @@ typedef struct VbKernelPreambleHeader {
#define EXPECTED_VBKERNELPREAMBLEHEADER_SIZE 96
+/* Magic number for recognizing VbSharedDataHeader ("VbSD") */
+#define VB_SHARED_DATA_MAGIC 0x44536256
+
/* Minimum and recommended size of shared_data_blob in bytes. */
#define VB_SHARED_DATA_MIN_SIZE 3072
#define VB_SHARED_DATA_REC_SIZE 16384
+/* Flags for VbSharedDataHeader */
+/* LoadFirmware() tried firmware B because of VbNvStorage firmware B tries */
+#define VBSD_FWB_TRIED 0x00000001
+/* LoadKernel() verified the kernel keyblock using the kernel subkey from
+ * the firmware. If this flag is not present, it just used the hash of the
+ * kernel keyblock. */
+#define VBSD_KERNEL_KEY_VERIFIED 0x00000002
+/* LoadFirmware() was told the developer switch was on */
+#define VBSD_LF_DEV_SWITCH_ON 0x00000004
+
+/* Result codes for checking firmware A and B */
+#define VBSD_LF_CHECK_NOT_DONE 0
+#define VBSD_LF_CHECK_DEV_MISMATCH 1
+#define VBSD_LF_CHECK_REC_MISMATCH 2
+#define VBSD_LF_CHECK_VERIFY_KEYBLOCK 3
+#define VBSD_LF_CHECK_KEY_ROLLBACK 4
+#define VBSD_LF_CHECK_DATA_KEY_PARSE 5
+#define VBSD_LF_CHECK_VERIFY_PREAMBLE 6
+#define VBSD_LF_CHECK_FW_ROLLBACK 7
+#define VBSD_LF_CHECK_HEADER_VALID 8
+#define VBSD_LF_CHECK_GET_FW_BODY 9
+#define VBSD_LF_CHECK_HASH_WRONG_SIZE 10
+#define VBSD_LF_CHECK_VERIFY_BODY 11
+#define VBSD_LF_CHECK_VALID 12
+
/* Data shared between LoadFirmware(), LoadKernel(), and OS.
*
* The boot process is:
@@ -149,18 +177,19 @@ typedef struct VbKernelPreambleHeader {
* 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 */
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 */
- uint64_t flags; /* Flags */
-
/* 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. */
@@ -171,6 +200,13 @@ typedef struct VbSharedDataHeader {
uint64_t timer_load_kernel_enter; /* LoadKernel() - enter */
uint64_t timer_load_kernel_exit; /* LoadKernel() - exit */
+ 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 */
+ uint32_t fw_version_tpm_start; /* Firmware TPM version at start */
+ uint32_t fw_version_lowest; /* Firmware lowest version found */
+
/* After read-only firmware which uses version 1 is released, any additional
* fields must be added below, and the struct version must be increased.
* Before reading/writing those fields, make sure that the struct being
« no previous file with comments | « firmware/include/load_firmware_fw.h ('k') | firmware/lib/vboot_common.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698