diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/commonlib/bsd/include/commonlib/bsd/elog.h | 10 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/elog.c | 38 |
2 files changed, 7 insertions, 41 deletions
diff --git a/src/commonlib/bsd/include/commonlib/bsd/elog.h b/src/commonlib/bsd/include/commonlib/bsd/elog.h index 63761ebf53e9..b49b37550037 100644 --- a/src/commonlib/bsd/include/commonlib/bsd/elog.h +++ b/src/commonlib/bsd/include/commonlib/bsd/elog.h @@ -204,9 +204,9 @@ struct elog_event_data_wake { } __packed; /* ChromeOS related events */ -#define ELOG_TYPE_CROS_DEVELOPER_MODE 0xa0 -#define ELOG_TYPE_CROS_RECOVERY_MODE 0xa1 -#define ELOG_CROS_RECOVERY_MODE_BUTTON 0x02 +#define ELOG_DEPRECATED_TYPE_CROS_DEVELOPER_MODE 0xa0 +#define ELOG_DEPRECATED_TYPE_CROS_RECOVERY_MODE 0xa1 +#define ELOG_DEPRECATED_CROS_RECOVERY_MODE_BUTTON 0x02 /* Management Engine Events */ #define ELOG_TYPE_MANAGEMENT_ENGINE 0xa2 @@ -306,8 +306,8 @@ struct elog_event_mem_cache_update { #define ELOG_TYPE_MI_HR 0xb5 /* ChromeOS diagnostics-related events */ -#define ELOG_TYPE_CROS_DIAGNOSTICS 0xb6 -#define ELOG_CROS_LAUNCH_DIAGNOSTICS 0x01 +#define ELOG_DEPRECATED_TYPE_CROS_DIAGNOSTICS 0xb6 +#define ELOG_DEPRECATED_CROS_LAUNCH_DIAGNOSTICS 0x01 struct elog_event_extended_event { uint8_t event_type; diff --git a/src/vendorcode/google/chromeos/elog.c b/src/vendorcode/google/chromeos/elog.c index d8304f8b30c1..4d3fc4053741 100644 --- a/src/vendorcode/google/chromeos/elog.c +++ b/src/vendorcode/google/chromeos/elog.c @@ -8,33 +8,7 @@ #include <security/vboot/vboot_common.h> #include <vb2_api.h> -static void elog_add_boot_reason(void) -{ - const int rec = vboot_recovery_mode_enabled(); - const int dev = vboot_developer_mode_enabled(); - - if (rec) { - const u8 reason = vboot_check_recovery_request(); - elog_add_event_byte(ELOG_TYPE_CROS_RECOVERY_MODE, reason); - printk(BIOS_DEBUG, "%s: Logged recovery mode boot%s, reason: 0x%02x\n", - __func__, dev ? " (Dev-switch on)" : "", reason); - } - - /* Skip logging developer mode in ACPI resume path */ - if (dev && !acpi_is_wakeup_s3()) { - elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE); - printk(BIOS_DEBUG, "%s: Logged dev mode boot\n", __func__); - } - - /* Diagnostic boot if requested */ - if (vboot_get_context()->boot_mode == VB2_BOOT_MODE_DIAGNOSTICS) { - elog_add_event_byte(ELOG_TYPE_CROS_DIAGNOSTICS, - ELOG_CROS_LAUNCH_DIAGNOSTICS); - printk(BIOS_DEBUG, "%s: Logged diagnostic boot\n", __func__); - } -} - -static void elog_add_vboot_info(void) +static void elog_add_vboot_info(void *unused) { /* Skip logging boot info in ACPI resume path */ if (acpi_is_wakeup_s3()) @@ -50,12 +24,4 @@ static void elog_add_vboot_info(void) elog_add_event_raw(ELOG_TYPE_FW_VBOOT_INFO, &data, width); } -static void elog_add_boot_records(void *unused) -{ - /* Log boot reason into the eventlog */ - elog_add_boot_reason(); - /* Log fw vboot info into the eventlog */ - elog_add_vboot_info(); -} - -BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_ENTRY, elog_add_boot_records, NULL); +BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_ENTRY, elog_add_vboot_info, NULL); |