Add VbSharedData field parsing
R=reinauer@chromium.org
BUG=chrome-os-partner:2578
TEST=manual
crossystem vdat_timers
should show 'LFS=0,0 LF=number1,number2 LK=number3,number4'
where number1 < number2 < number3 < number4
crossystem vdat_lfdebug
run from a dev mode console, should show
'check=12,0 index=0x00 tpmver=(hex number) lowestver=(hex number)'
crossystem vdat_flags
run from a dev mode console, flags should be 0x04.
Review URL: http://codereview.chromium.org/6685068
Change-Id: Id7b958ae300d10cdcdc1b17a1bb17b7e5069166f
diff --git a/utility/crossystem_main.c b/utility/crossystem_main.c
index abd4186..fb84283 100644
--- a/utility/crossystem_main.c
+++ b/utility/crossystem_main.c
@@ -11,10 +11,15 @@
#include "crossystem.h"
+/* Flags for Param */
+#define IS_STRING 0x01 /* String (not present = integer) */
+#define CAN_WRITE 0x02 /* Writable (not present = read-only */
+#define NO_PRINT_ALL 0x04 /* Don't print contents of parameter when
+ * doing a print-all */
+
typedef struct Param {
const char* name; /* Parameter name */
- int is_string; /* 0 if integer, 1 if string */
- int can_write; /* 0 if read-only, 1 if writable */
+ int flags; /* Flags (see above) */
const char* desc; /* Human-readable description */
const char* format; /* Format string, if non-NULL and 0==is_string*/
} Param;
@@ -22,41 +27,41 @@
/* List of parameters, terminated with a param with NULL name */
const Param sys_param_list[] = {
/* Read-only integers */
- {"devsw_cur", 0, 0, "Developer switch current position"},
- {"devsw_boot", 0, 0, "Developer switch position at boot"},
- {"recoverysw_cur", 0, 0, "Recovery switch current position"},
- {"recoverysw_boot", 0, 0, "Recovery switch position at boot"},
- {"recoverysw_ec_boot", 0, 0, "Recovery switch position at EC boot"},
- {"wpsw_cur", 0, 0,
- "Firmware write protect hardware switch current position"},
- {"wpsw_boot", 0, 0,
- "Firmware write protect hardware switch position at boot"},
- {"recovery_reason", 0, 0, "Recovery mode reason for current boot"},
- {"savedmem_base", 0, 0, "RAM debug data area physical address", "0x%08x"},
- {"savedmem_size", 0, 0, "RAM debug data area size in bytes"},
- {"fmap_base", 0, 0, "Main firmware flashmap physical address", "0x%08x"},
- {"tried_fwb", 0, 0, "Tried firmware B before A this boot"},
- {"cros_debug", 0, 0, "OS should allow debug features"},
+ {"devsw_cur", 0, "Developer switch current position"},
+ {"devsw_boot", 0, "Developer switch position at boot"},
+ {"recoverysw_cur", 0, "Recovery switch current position"},
+ {"recoverysw_boot", 0, "Recovery switch position at boot"},
+ {"recoverysw_ec_boot", 0, "Recovery switch position at EC boot"},
+ {"wpsw_cur", 0, "Firmware write protect hardware switch current position"},
+ {"wpsw_boot", 0, "Firmware write protect hardware switch position at boot"},
+ {"recovery_reason", 0, "Recovery mode reason for current boot"},
+ {"savedmem_base", 0, "RAM debug data area physical address", "0x%08x"},
+ {"savedmem_size", 0, "RAM debug data area size in bytes"},
+ {"fmap_base", 0, "Main firmware flashmap physical address", "0x%08x"},
+ {"tried_fwb", 0, "Tried firmware B before A this boot"},
+ {"cros_debug", 0, "OS should allow debug features"},
+ {"vdat_flags", 0, "Flags from VbSharedData", "0x%08x"},
/* Read-only strings */
- {"hwid", 1, 0, "Hardware ID"},
- {"fwid", 1, 0, "Active firmware ID"},
- {"ro_fwid", 1, 0, "Read-only firmware ID"},
- {"mainfw_act", 1, 0, "Active main firmware"},
- {"mainfw_type", 1, 0, "Active main firmware type"},
- {"ecfw_act", 1, 0, "Active EC firmware"},
- {"kernkey_vfy", 1, 0, "Type of verification done on kernel key block"},
+ {"hwid", IS_STRING, "Hardware ID"},
+ {"fwid", IS_STRING, "Active firmware ID"},
+ {"ro_fwid", IS_STRING, "Read-only firmware ID"},
+ {"mainfw_act", IS_STRING, "Active main firmware"},
+ {"mainfw_type", IS_STRING, "Active main firmware type"},
+ {"ecfw_act", IS_STRING, "Active EC firmware"},
+ {"kernkey_vfy", IS_STRING, "Type of verification done on kernel key block"},
+ {"vdat_timers", IS_STRING, "Timer values from VbSharedData"},
+ {"vdat_lfdebug", IS_STRING, "LoadFirmware() debug data VbSharedData"},
/* Writable integers */
- {"nvram_cleared", 0, 1, "Have NV settings been lost? Write 0 to clear"},
- {"kern_nv", 0, 1, "Non-volatile field for kernel use", "0x%08x"},
- {"recovery_request", 0, 1, "Recovery mode request (writable)"},
- {"dbg_reset", 0, 1, "Debug reset mode request (writable)"},
- {"fwb_tries", 0, 1, "Try firmware B count (writable)"},
- {"vbtest_errfunc", 0, 1, "Verified boot test error function (writable)"},
- {"vbtest_errno", 0, 1, "Verified boot test error number (writable)"},
- {"vdat", 1, 0, "Raw VDAT contents."},
+ {"nvram_cleared", CAN_WRITE, "Have NV settings been lost? Write 0 to clear"},
+ {"kern_nv", CAN_WRITE, "Non-volatile field for kernel use", "0x%08x"},
+ {"recovery_request", CAN_WRITE, "Recovery mode request (writable)"},
+ {"dbg_reset", CAN_WRITE, "Debug reset mode request (writable)"},
+ {"fwb_tries", CAN_WRITE, "Try firmware B count (writable)"},
+ {"vbtest_errfunc", CAN_WRITE, "Verified boot test error function (writable)"},
+ {"vbtest_errno", CAN_WRITE, "Verified boot test error number (writable)"},
/* Terminate with null name */
- {NULL, 0, 0, NULL}
+ {NULL, 0, NULL}
};
@@ -98,10 +103,10 @@
*
* Returns 0 if success, non-zero if error. */
int SetParam(const Param* p, const char* value) {
- if (!p->can_write)
+ if (!(p->flags & CAN_WRITE))
return 1; /* Parameter is read-only */
- if (p->is_string) {
+ if (p->flags & IS_STRING) {
return (0 == VbSetSystemPropertyString(p->name, value) ? 0 : 1);
} else {
char* e;
@@ -117,7 +122,7 @@
*
* Returns 0 if success (match), non-zero if error (mismatch). */
int CheckParam(const Param* p, char* expect) {
- if (p->is_string) {
+ if (p->flags & IS_STRING) {
char buf[256];
const char* v = VbGetSystemPropertyString(p->name, buf, sizeof(buf));
if (!v || 0 != strcmp(v, expect))
@@ -139,7 +144,7 @@
*
* Returns 0 if success, non-zero if error. */
int PrintParam(const Param* p) {
- if (p->is_string) {
+ if (p->flags & IS_STRING) {
char buf[256];
const char* v = VbGetSystemPropertyString(p->name, buf, sizeof(buf));
if (!v)
@@ -165,7 +170,9 @@
const char* value;
for (p = sys_param_list; p->name; p++) {
- if (p->is_string) {
+ if (p->flags & NO_PRINT_ALL)
+ continue;
+ if (p->flags & IS_STRING) {
value = VbGetSystemPropertyString(p->name, buf, sizeof(buf));
} else {
int v = VbGetSystemPropertyInt(p->name);
@@ -176,7 +183,7 @@
value = buf;
}
}
- printf("%-22s = %-20s # %s\n",
+ printf("%-22s = %-30s # %s\n",
p->name, (value ? value : "(error)"), p->desc);
}
return retval;