<p>Patrick Georgi has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/30023">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">smmstore: make smmstore's SMM handler code follow everything else<br><br>Instead of SMMSTORE_APM_CNT use APM_CNT_SMMSTORE and define it in<br>cpu/x86/smm.h<br><br>Change-Id: Iabc0c9662284ed3ac2933001e64524011a5bf420<br>Signed-off-by: Patrick Georgi <pgeorgi@google.com><br>---<br>M src/include/cpu/x86/smm.h<br>M src/include/smmstore.h<br>M src/soc/intel/common/block/smm/smihandler.c<br>3 files changed, 3 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/30023/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h</span><br><span>index 857ab35..576449d 100644</span><br><span>--- a/src/include/cpu/x86/smm.h</span><br><span>+++ b/src/include/cpu/x86/smm.h</span><br><span>@@ -473,6 +473,7 @@</span><br><span> #define APM_CNT_GNVS_UPDATE 0xea</span><br><span> #define APM_CNT_FINALIZE 0xcb</span><br><span> #define APM_CNT_LEGACY 0xcc</span><br><span style="color: hsl(120, 100%, 40%);">+#define APM_CNT_SMMSTORE 0xed</span><br><span> #define APM_CNT_ELOG_GSMI 0xef</span><br><span> #define APM_STS 0xb3</span><br><span> </span><br><span>diff --git a/src/include/smmstore.h b/src/include/smmstore.h</span><br><span>index 685a425..a535c5b 100644</span><br><span>--- a/src/include/smmstore.h</span><br><span>+++ b/src/include/smmstore.h</span><br><span>@@ -19,8 +19,6 @@</span><br><span> #include <stddef.h></span><br><span> #include <stdint.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define SMMSTORE_APM_CNT 0xed</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #define SMMSTORE_RET_SUCCESS 0</span><br><span> #define SMMSTORE_RET_FAILURE 1</span><br><span> #define SMMSTORE_RET_UNSUPPORTED 2</span><br><span>diff --git a/src/soc/intel/common/block/smm/smihandler.c b/src/soc/intel/common/block/smm/smihandler.c</span><br><span>index 093c50e..2ffc00f 100644</span><br><span>--- a/src/soc/intel/common/block/smm/smihandler.c</span><br><span>+++ b/src/soc/intel/common/block/smm/smihandler.c</span><br><span>@@ -301,7 +301,7 @@</span><br><span> void *io_smi;</span><br><span> uint32_t reg_ebx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- io_smi = find_save_state(save_state_ops, SMMSTORE_APM_CNT);</span><br><span style="color: hsl(120, 100%, 40%);">+ io_smi = find_save_state(save_state_ops, APM_CNT_SMMSTORE);</span><br><span> if (!io_smi)</span><br><span> return;</span><br><span> /* Command and return value in EAX */</span><br><span>@@ -391,7 +391,7 @@</span><br><span> if (IS_ENABLED(CONFIG_ELOG_GSMI))</span><br><span> southbridge_smi_gsmi(save_state_ops);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case SMMSTORE_APM_CNT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case APM_CNT_SMMSTORE:</span><br><span> if (IS_ENABLED(CONFIG_SMMSTORE))</span><br><span> southbridge_smi_store(save_state_ops);</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30023">change 30023</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/+/30023"/><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: Iabc0c9662284ed3ac2933001e64524011a5bf420 </div>
<div style="display:none"> Gerrit-Change-Number: 30023 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>