From 985f118de077e28dd302b6788b7fdea637b0347f Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Tue, 7 Mar 2017 19:25:48 -0800 Subject: [PATCH] UPSTREAM: chromeos/elog: Filter developer mode entry on S3 resume The event log entry indicating developer mode is useful for the boot path, but is not really useful on the resume path and removing it makes the event log easier to read when developer mode is enabled. To make this work I have to use #ifdef around the ACPI code since this is shared with ARM which does not have acpi.h. BUG=b:36042662 BRANCH=none TEST=perform suspend/resume on Eve and check that the event log does not have an entry for Chrome OS Developer Mode. Change-Id: Ief6dead73856689f0fb0bce6266d66c7196340ee Signed-off-by: Patrick Georgi Original-Commit-Id: f8401cddb82adbc8c5a8268f6215cf3cf903cfbf Original-Change-Id: I1a9d775d18e794b41c3d701e5211c238a888501a Original-Signed-off-by: Duncan Laurie Original-Reviewed-on: https://review.coreboot.org/18665 Original-Reviewed-by: Aaron Durbin Original-Tested-by: build bot (Jenkins) Reviewed-on: https://chromium-review.googlesource.com/452361 --- src/vendorcode/google/chromeos/elog.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/vendorcode/google/chromeos/elog.c b/src/vendorcode/google/chromeos/elog.c index fd138ed87e..f16f0add0b 100644 --- a/src/vendorcode/google/chromeos/elog.c +++ b/src/vendorcode/google/chromeos/elog.c @@ -18,6 +18,10 @@ #include #include +#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) +#include +#endif + static void elog_add_boot_reason(void *unused) { int rec = vboot_recovery_mode_enabled(); @@ -35,8 +39,19 @@ static void elog_add_boot_reason(void *unused) } if (dev) { - elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE); - printk(BIOS_DEBUG, "%s: Logged dev mode boot\n", __func__); + int log_event = 1; + +#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) + /* Skip logging developer mode in ACPI resume path */ + if (acpi_is_wakeup()) + log_event = 0; +#endif + + if (log_event) { + elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE); + printk(BIOS_DEBUG, "%s: Logged dev mode boot\n", + __func__); + } } }