summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2017-10-16 23:02:00 -0700
committerFurquan Shaikh <furquan@google.com>2017-10-19 00:43:56 +0000
commit4854761ba49696050fa00e04ccd461a8e91e21fa (patch)
tree1777064ea459e4c339a65ff17d255ebf5ca12856 /src/mainboard/google
parent70b257f1b47da274362179584dfb615d3bc6e365 (diff)
downloadcoreboot-4854761ba49696050fa00e04ccd461a8e91e21fa.tar.xz
mb/google/poppy: Log EC events during S0ix resume
This change adds support for logging EC events during S0ix resume. BUG=b:67874513 TEST=Verified that EC events are correctly logged during S0ix resume: 284 | 2017-10-16 20:45:12 | S0ix Enter 285 | 2017-10-16 20:45:16 | S0ix Exit 286 | 2017-10-16 20:45:16 | Wake Source | Power Button | 0 287 | 2017-10-16 20:45:16 | EC Event | Power Button 288 | 2017-10-16 20:45:35 | S0ix Enter 289 | 2017-10-16 20:45:40 | S0ix Exit 290 | 2017-10-16 20:45:40 | Wake Source | GPIO | 112 291 | 2017-10-16 20:45:40 | EC Event | Lid Open 292 | 2017-10-16 20:50:51 | S0ix Enter 293 | 2017-10-16 20:50:59 | S0ix Exit 294 | 2017-10-16 20:50:59 | Wake Source | GPIO | 112 295 | 2017-10-16 20:50:59 | EC Event | Mode change Change-Id: I9f6dcb8852d94ebf90bb5b63a17fde524d58d49f Signed-off-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: https://review.coreboot.org/22091 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/poppy/smihandler.c8
-rw-r--r--src/mainboard/google/poppy/variants/baseboard/include/baseboard/ec.h2
-rw-r--r--src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h2
3 files changed, 12 insertions, 0 deletions
diff --git a/src/mainboard/google/poppy/smihandler.c b/src/mainboard/google/poppy/smihandler.c
index 70d0ab4edf..e880581d5b 100644
--- a/src/mainboard/google/poppy/smihandler.c
+++ b/src/mainboard/google/poppy/smihandler.c
@@ -14,7 +14,9 @@
*/
#include <cpu/x86/smm.h>
+#include <ec/google/chromeec/ec.h>
#include <ec/google/chromeec/smm.h>
+#include <elog.h>
#include <gpio.h>
#include <soc/gpio.h>
#include <soc/smm.h>
@@ -39,3 +41,9 @@ int mainboard_smi_apmc(u8 apmc)
MAINBOARD_EC_SMI_EVENTS);
return 0;
}
+
+void elog_gsmi_cb_mainboard_log_wake_source(void)
+{
+ google_chromeec_log_events(MAINBOARD_EC_LOG_EVENTS |
+ MAINBOARD_EC_S0IX_WAKE_EVENTS);
+}
diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/ec.h
index 1312f63b43..5edbe59a44 100644
--- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/ec.h
+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/ec.h
@@ -54,6 +54,8 @@
EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEY_PRESSED) |\
EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE))
+#define MAINBOARD_EC_S0IX_WAKE_EVENTS (MAINBOARD_EC_S3_WAKE_EVENTS)
+
/* Log EC wake events plus EC shutdown events */
#define MAINBOARD_EC_LOG_EVENTS \
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\
diff --git a/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h b/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h
index 804c4b36c8..7bee05a62e 100644
--- a/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h
+++ b/src/mainboard/google/poppy/variants/nautilus/include/variant/ec.h
@@ -53,6 +53,8 @@
(MAINBOARD_EC_S5_WAKE_EVENTS |\
EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEY_PRESSED))
+#define MAINBOARD_EC_S0IX_WAKE_EVENTS (MAINBOARD_EC_S3_WAKE_EVENTS)
+
/* Log EC wake events plus EC shutdown events */
#define MAINBOARD_EC_LOG_EVENTS \
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\