<p>Furquan Shaikh has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28984">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/poppy/var/nocturne: Provide override for ec eventinfo<br><br>This change implements the callback to provide google_chromeec_event_info<br>structure in nocturne variant and sets MKBP SCI based on board id.<br><br>BUG=b:112366846,b:112112483,b:112111610<br><br>Change-Id: Ifcc10aefc8f450214bd64dfffaf8854ada43f323<br>Signed-off-by: Furquan Shaikh <furquan@google.com><br>---<br>M src/mainboard/google/poppy/variants/nocturne/Makefile.inc<br>A src/mainboard/google/poppy/variants/nocturne/ec.c<br>M src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h<br>3 files changed, 39 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/28984/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc</span><br><span>index c17a49c..f202ef1 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc</span><br><span>+++ b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc</span><br><span>@@ -20,3 +20,5 @@</span><br><span> ramstage-y += gpio.c</span><br><span> ramstage-y += nhlt.c</span><br><span> ramstage-y += mainboard.c</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+smm-y += ec.c</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nocturne/ec.c b/src/mainboard/google/poppy/variants/nocturne/ec.c</span><br><span>new file mode 100644</span><br><span>index 0000000..13c4a42</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/poppy/variants/nocturne/ec.c</span><br><span>@@ -0,0 +1,37 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2016 Google Inc.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <arch/acpi.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <baseboard/variants.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <boardid.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <ec/google/chromeec/ec.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <variant/ec.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct google_chromeec_event_info *variant_get_event_info(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+      static struct google_chromeec_event_info info = {</span><br><span style="color: hsl(120, 100%, 40%);">+             .log_events = MAINBOARD_EC_LOG_EVENTS,</span><br><span style="color: hsl(120, 100%, 40%);">+                .sci_events = MAINBOARD_EC_SCI_EVENTS,</span><br><span style="color: hsl(120, 100%, 40%);">+                .s3_wake_events = MAINBOARD_EC_S3_WAKE_EVENTS,</span><br><span style="color: hsl(120, 100%, 40%);">+                .s5_wake_events = MAINBOARD_EC_S5_WAKE_EVENTS,</span><br><span style="color: hsl(120, 100%, 40%);">+                .s0ix_wake_events = MAINBOARD_EC_S0IX_WAKE_EVENTS,</span><br><span style="color: hsl(120, 100%, 40%);">+    };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  if (board_id() <= 2)</span><br><span style="color: hsl(120, 100%, 40%);">+               info.sci_events |= EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  return &info;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h b/src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h</span><br><span>index ba481e4..46e848b 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h</span><br><span>+++ b/src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h</span><br><span>@@ -34,7 +34,6 @@</span><br><span>     EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START)    |\</span><br><span>       EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP)     |\</span><br><span>       EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU)            |\</span><br><span style="color: hsl(0, 100%, 40%);">-  EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP)              |\</span><br><span>       EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE))</span><br><span> </span><br><span> #define MAINBOARD_EC_SMI_EVENTS \</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28984">change 28984</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/28984"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ifcc10aefc8f450214bd64dfffaf8854ada43f323 </div>
<div style="display:none"> Gerrit-Change-Number: 28984 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Furquan Shaikh <furquan@google.com> </div>