summaryrefslogtreecommitdiff
path: root/src/mainboard/google/cyan
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2017-10-04 14:01:41 -0700
committerFurquan Shaikh <furquan@google.com>2017-10-08 19:38:28 +0000
commit2749c52080bbaba9e6ce54fb327b7157a7e392c2 (patch)
tree91e05dd62841fe1d1f0f63bba017d1fd11550613 /src/mainboard/google/cyan
parent687b023d970327e2d4994e5fb170edf9a1e7180f (diff)
downloadcoreboot-2749c52080bbaba9e6ce54fb327b7157a7e392c2.tar.xz
ec/google/chromeec: Add library function google_chromeec_events_init
mainboard_ec_init implemented by all x86-based mainboards using chromeec performed similar tasks for initializing and recording ec events. Instead of duplicating this code across multiple boards, provide a library function google_chromeec_events_init that can be called by mainboard with appropriate inputs to perform the required actions. This change also adds a new structure google_chromeec_event_info to allow mainboards to provide information required by the library function to handle different event masks. Also, google_chromeec_log_device_events and google_chromeec_log_events no longer need to be exported. Change-Id: I1cbc24e3e1a31aed35d8527f90ed16ed15ccaa86 Signed-off-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: https://review.coreboot.org/21877 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Diffstat (limited to 'src/mainboard/google/cyan')
-rw-r--r--src/mainboard/google/cyan/ec.c33
1 files changed, 9 insertions, 24 deletions
diff --git a/src/mainboard/google/cyan/ec.c b/src/mainboard/google/cyan/ec.c
index cce7d705e1..efd20a597f 100644
--- a/src/mainboard/google/cyan/ec.c
+++ b/src/mainboard/google/cyan/ec.c
@@ -23,33 +23,18 @@
void mainboard_ec_init(void)
{
+ const struct google_chromeec_event_info info = {
+ .log_events = MAINBOARD_EC_LOG_EVENTS,
+ .sci_events = MAINBOARD_EC_SCI_EVENTS,
+ .s3_wake_events = MAINBOARD_EC_S3_WAKE_EVENTS,
+ .s5_wake_events = MAINBOARD_EC_S5_WAKE_EVENTS,
+ };
+
printk(BIOS_DEBUG, "mainboard_ec_init\n");
post_code(0xf0);
-#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)
- /* Restore SCI event mask on resume. */
- if (acpi_is_wakeup_s3()) {
- google_chromeec_log_events(MAINBOARD_EC_LOG_EVENTS |
- MAINBOARD_EC_S3_WAKE_EVENTS);
-
- /* Disable SMI and wake events */
- google_chromeec_set_smi_mask(0);
-
- /* Clear pending events */
- while (google_chromeec_get_event() != 0)
- ;
- /*
- * Set SCI mask.OS may not generate SMI event to set
- * this on S3 resume.
- */
- google_chromeec_set_sci_mask(MAINBOARD_EC_SCI_EVENTS);
- } else {
- google_chromeec_log_events(MAINBOARD_EC_LOG_EVENTS |
- MAINBOARD_EC_S5_WAKE_EVENTS);
- }
+ if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC))
+ google_chromeec_events_init(&info, acpi_is_wakeup_s3());
- /* Clear wake event mask */
- google_chromeec_set_wake_mask(0);
-#endif
post_code(0xf1);
}