summaryrefslogtreecommitdiff
path: root/src/ec
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2018-05-30 11:51:23 -0700
committerFurquan Shaikh <furquan@google.com>2018-06-01 12:47:17 +0000
commit1a5b7c6540e05e27cbb2c1985402e3b4d160e57e (patch)
tree051a67f6827177d600b55c032a0600dfe35c50b8 /src/ec
parent9bd601584350f51f112b15a7369f9aa82f1d0919 (diff)
downloadcoreboot-1a5b7c6540e05e27cbb2c1985402e3b4d160e57e.tar.xz
ec/google/chromeec: Initialize SMI mask in google_chromeec_events_init
This change adds smi_events to google_chromeec_event_info and allows mainboards to set SMI mask if current boot type is not S3 wakeup. Change-Id: I899a6af6e57d295b4eac2039c8245ebcc73a42bb Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/26709 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org> Reviewed-by: Martin Roth <martinroth@google.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/ec')
-rw-r--r--src/ec/google/chromeec/ec.c4
-rw-r--r--src/ec/google/chromeec/ec.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index 72ca2408a9..094f7ce9a5 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -474,14 +474,16 @@ void google_chromeec_events_init(const struct google_chromeec_event_info *info,
google_chromeec_set_sci_mask(info->sci_events);
} else {
+ google_chromeec_set_smi_mask(info->smi_events);
+
google_chromeec_log_events(info->log_events |
info->s5_wake_events);
+
if (google_chromeec_is_uhepi_supported())
google_chromeec_set_lazy_wake_masks
(info->s5_wake_events,
info->s3_wake_events,
info->s0ix_wake_events);
-
}
/* Clear wake event mask. */
diff --git a/src/ec/google/chromeec/ec.h b/src/ec/google/chromeec/ec.h
index 24c892291a..7310ade09d 100644
--- a/src/ec/google/chromeec/ec.h
+++ b/src/ec/google/chromeec/ec.h
@@ -152,6 +152,7 @@ int google_chromeec_command(struct chromeec_command *cec_command);
struct google_chromeec_event_info {
uint64_t log_events;
uint64_t sci_events;
+ uint64_t smi_events;
uint64_t s3_wake_events;
uint64_t s3_device_events;
uint64_t s5_wake_events;