<p>Furquan Shaikh has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28983">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/poppy: Allow variants to provide event info at runtime<br><br>This change adds a variant callback to read google_chromeec_event_info<br>from variant at runtime to allow override of any events based on<br>factors like board id.<br><br>BUG=b:112366846,b:112112483,b:112111610<br><br>Change-Id: If89e904c92372530a0f555952f87702f068e0b03<br>Signed-off-by: Furquan Shaikh <furquan@google.com><br>---<br>M src/mainboard/google/poppy/ec.c<br>M src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h<br>2 files changed, 11 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/28983/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/ec.c b/src/mainboard/google/poppy/ec.c</span><br><span>index 7b9b9a7..540a7ae 100644</span><br><span>--- a/src/mainboard/google/poppy/ec.c</span><br><span>+++ b/src/mainboard/google/poppy/ec.c</span><br><span>@@ -14,13 +14,14 @@</span><br><span>  */</span><br><span> </span><br><span> #include <arch/acpi.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <baseboard/variants.h></span><br><span> #include <ec/google/chromeec/ec.h></span><br><span> </span><br><span> #include <variant/ec.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void mainboard_ec_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+__weak const struct google_chromeec_event_info *variant_get_event_info(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  const struct google_chromeec_event_info info = {</span><br><span style="color: hsl(120, 100%, 40%);">+      static const struct google_chromeec_event_info info = {</span><br><span>              .log_events = MAINBOARD_EC_LOG_EVENTS,</span><br><span>               .sci_events = MAINBOARD_EC_SCI_EVENTS,</span><br><span>               .s3_wake_events = MAINBOARD_EC_S3_WAKE_EVENTS,</span><br><span>@@ -28,6 +29,10 @@</span><br><span>          .s0ix_wake_events = MAINBOARD_EC_S0IX_WAKE_EVENTS,</span><br><span>   };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  google_chromeec_events_init(&info, acpi_is_wakeup_s3());</span><br><span style="color: hsl(120, 100%, 40%);">+  return &info;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void mainboard_ec_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+     google_chromeec_events_init(variant_get_event_info(), acpi_is_wakeup_s3());</span><br><span> }</span><br><span>diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h</span><br><span>index 3c58971..fff7c65 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h</span><br><span>+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h</span><br><span>@@ -73,4 +73,7 @@</span><br><span> void variant_nhlt_oem_overrides(const char **oem_id, const char **oem_table_id,</span><br><span>                                 uint32_t *oem_revision);</span><br><span> </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> #endif /* __BASEBOARD_VARIANTS_H__ */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28983">change 28983</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/28983"/><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: If89e904c92372530a0f555952f87702f068e0b03 </div>
<div style="display:none"> Gerrit-Change-Number: 28983 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Furquan Shaikh <furquan@google.com> </div>