<p>Patrick Georgi <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/c/coreboot/+/29975">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Nico Huber: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sb/intel/lynxpoint: Make the finalise handler common<br><br>The ASRock H81M-HDS doesn't implement a finalise handler. To fix<br>this, and reduce code duplication in the process, make a common<br>implementation. There should be no functional change to boards with<br>existing finalise handlers, since the code is identical among them and<br>the new, common implementation.<br><br>Tested on an ASRock H81M-HDS. The finalise handler works.<br><br>Change-Id: I13b581a2219288019a4e0c9e618db3ac7c3c15ab<br>Signed-off-by: Tristan Corrick <tristan@corrick.kiwi><br>Reviewed-on: https://review.coreboot.org/c/29975<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Nico Huber <nico.h@gmx.de><br>---<br>M src/mainboard/google/beltino/smihandler.c<br>M src/mainboard/google/slippy/smihandler.c<br>M src/mainboard/intel/baskingridge/mainboard_smi.c<br>M src/southbridge/intel/lynxpoint/smihandler.c<br>4 files changed, 15 insertions(+), 60 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/beltino/smihandler.c b/src/mainboard/google/beltino/smihandler.c</span><br><span>index 3d9324d..074a3e9 100644</span><br><span>--- a/src/mainboard/google/beltino/smihandler.c</span><br><span>+++ b/src/mainboard/google/beltino/smihandler.c</span><br><span>@@ -27,29 +27,6 @@</span><br><span> #include <superio/ite/it8772f/it8772f.h></span><br><span> #include "onboard.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int mainboard_finalized = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int mainboard_smi_apmc(u8 apmc)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- switch (apmc) {</span><br><span style="color: hsl(0, 100%, 40%);">- case APM_CNT_FINALIZE:</span><br><span style="color: hsl(0, 100%, 40%);">- if (mainboard_finalized) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_DEBUG, "SMI#: Already finalized\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- intel_pch_finalize_smm();</span><br><span style="color: hsl(0, 100%, 40%);">- intel_northbridge_haswell_finalize_smm();</span><br><span style="color: hsl(0, 100%, 40%);">- intel_cpu_haswell_finalize_smm();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mainboard_finalized = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void mainboard_smi_sleep(u8 slp_typ)</span><br><span> {</span><br><span> switch (slp_typ) {</span><br><span>diff --git a/src/mainboard/google/slippy/smihandler.c b/src/mainboard/google/slippy/smihandler.c</span><br><span>index 3480147..bab764a 100644</span><br><span>--- a/src/mainboard/google/slippy/smihandler.c</span><br><span>+++ b/src/mainboard/google/slippy/smihandler.c</span><br><span>@@ -119,24 +119,9 @@</span><br><span> while (google_chromeec_get_event() != 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int mainboard_finalized = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int mainboard_smi_apmc(u8 apmc)</span><br><span> {</span><br><span> switch (apmc) {</span><br><span style="color: hsl(0, 100%, 40%);">- case APM_CNT_FINALIZE:</span><br><span style="color: hsl(0, 100%, 40%);">- if (mainboard_finalized) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_DEBUG, "SMI#: Already finalized\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- intel_pch_finalize_smm();</span><br><span style="color: hsl(0, 100%, 40%);">- intel_northbridge_haswell_finalize_smm();</span><br><span style="color: hsl(0, 100%, 40%);">- intel_cpu_haswell_finalize_smm();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mainboard_finalized = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> case APM_CNT_ACPI_ENABLE:</span><br><span> google_chromeec_set_smi_mask(0);</span><br><span> /* Clear all pending events */</span><br><span>diff --git a/src/mainboard/intel/baskingridge/mainboard_smi.c b/src/mainboard/intel/baskingridge/mainboard_smi.c</span><br><span>index 229085d..0fd0639 100644</span><br><span>--- a/src/mainboard/intel/baskingridge/mainboard_smi.c</span><br><span>+++ b/src/mainboard/intel/baskingridge/mainboard_smi.c</span><br><span>@@ -46,25 +46,3 @@</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int mainboard_finalized = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int mainboard_smi_apmc(u8 apmc)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- switch (apmc) {</span><br><span style="color: hsl(0, 100%, 40%);">- case APM_CNT_FINALIZE:</span><br><span style="color: hsl(0, 100%, 40%);">- if (mainboard_finalized) {</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_DEBUG, "SMI#: Already finalized\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- intel_pch_finalize_smm();</span><br><span style="color: hsl(0, 100%, 40%);">- intel_northbridge_haswell_finalize_smm();</span><br><span style="color: hsl(0, 100%, 40%);">- intel_cpu_haswell_finalize_smm();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- mainboard_finalized = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/southbridge/intel/lynxpoint/smihandler.c b/src/southbridge/intel/lynxpoint/smihandler.c</span><br><span>index 87848c2..12e5ea2 100644</span><br><span>--- a/src/southbridge/intel/lynxpoint/smihandler.c</span><br><span>+++ b/src/southbridge/intel/lynxpoint/smihandler.c</span><br><span>@@ -25,6 +25,8 @@</span><br><span> #include <elog.h></span><br><span> #include <halt.h></span><br><span> #include <pc80/mc146818rtc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <northbridge/intel/haswell/haswell.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <cpu/intel/haswell/haswell.h></span><br><span> #include "pch.h"</span><br><span> </span><br><span> #include "nvs.h"</span><br><span>@@ -270,11 +272,24 @@</span><br><span> {</span><br><span> u8 reg8;</span><br><span> em64t101_smm_state_save_area_t *state;</span><br><span style="color: hsl(120, 100%, 40%);">+ static int chipset_finalized = 0;</span><br><span> </span><br><span> /* Emulate B2 register as the FADT / Linux expects it */</span><br><span> </span><br><span> reg8 = inb(APM_CNT);</span><br><span> switch (reg8) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case APM_CNT_FINALIZE:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (chipset_finalized) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_DEBUG, "SMI#: Already finalized\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</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%);">+ intel_pch_finalize_smm();</span><br><span style="color: hsl(120, 100%, 40%);">+ intel_northbridge_haswell_finalize_smm();</span><br><span style="color: hsl(120, 100%, 40%);">+ intel_cpu_haswell_finalize_smm();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ chipset_finalized = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case APM_CNT_CST_CONTROL:</span><br><span> /* Calling this function seems to cause</span><br><span> * some kind of race condition in Linux</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/29975">change 29975</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/c/coreboot/+/29975"/><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-Change-Id: I13b581a2219288019a4e0c9e618db3ac7c3c15ab </div>
<div style="display:none"> Gerrit-Change-Number: 29975 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Tristan Corrick <tristan@corrick.kiwi> </div>
<div style="display:none"> Gerrit-Reviewer: Nico Huber <nico.h@gmx.de> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org> </div>
<div style="display:none"> Gerrit-Reviewer: Tristan Corrick <tristan@corrick.kiwi> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>