diff options
| author | Furquan Shaikh <furquan@google.com> | 2018-10-06 12:04:54 -0700 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2018-10-11 23:58:25 +0000 |
| commit | ba748cc7c0136e031249ddd831cc49f14885dc97 (patch) | |
| tree | 625b15595cd48384e4dec9d7867a044b75c220b5 | |
| parent | 6985c90ff44edc07224bf1b71df7f7630f700e25 (diff) | |
mb/google/poppy/var/nocturne: Provide override for ec eventinfo
This change implements the callback to provide google_chromeec_event_info
structure in nocturne variant and sets MKBP SCI based on board id.
BUG=b:112366846,b:112112483,b:112111610
Change-Id: Ifcc10aefc8f450214bd64dfffaf8854ada43f323
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/28984
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Enrico Granata <egranata@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
3 files changed, 40 insertions, 1 deletions
diff --git a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc index c17a49c08b..c282faab6b 100644 --- a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc +++ b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc @@ -20,3 +20,6 @@ romstage-y += memory.c ramstage-y += gpio.c ramstage-y += nhlt.c ramstage-y += mainboard.c + +smm-y += ec.c +ramstage-y += ec.c diff --git a/src/mainboard/google/poppy/variants/nocturne/ec.c b/src/mainboard/google/poppy/variants/nocturne/ec.c new file mode 100644 index 0000000000..3e187fc84b --- /dev/null +++ b/src/mainboard/google/poppy/variants/nocturne/ec.c @@ -0,0 +1,37 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2018 Google LLC. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <arch/acpi.h> +#include <baseboard/variants.h> +#include <boardid.h> +#include <ec/google/chromeec/ec.h> + +#include <variant/ec.h> + +const struct google_chromeec_event_info *variant_get_event_info(void) +{ + static 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, + .s0ix_wake_events = MAINBOARD_EC_S0IX_WAKE_EVENTS, + }; + + if (board_id() < 2) + info.sci_events |= EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP); + + return &info; +} diff --git a/src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h b/src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h index ba481e4542..46e848b710 100644 --- a/src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h +++ b/src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h @@ -34,7 +34,6 @@ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE)) #define MAINBOARD_EC_SMI_EVENTS \ |