<p>Patrick Georgi has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/30022">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">elog: make elog's SMM handler code follow everything else<br><br>Instead of ELOG_GSMI_APM_CNT use APM_CNT_ELOG_GSMI and define it in<br>cpu/x86/smm.h<br><br>Change-Id: I3a3e2f823c91b475d1e15b8c20e9cf5f3fd9de83<br>Signed-off-by: Patrick Georgi <pgeorgi@google.com><br>---<br>M src/include/cpu/x86/smm.h<br>M src/include/elog.h<br>M src/soc/amd/stoneyridge/smihandler.c<br>M src/soc/intel/baytrail/smihandler.c<br>M src/soc/intel/braswell/smihandler.c<br>M src/soc/intel/broadwell/smihandler.c<br>M src/soc/intel/common/block/smm/smihandler.c<br>M src/soc/intel/fsp_baytrail/smihandler.c<br>M src/southbridge/intel/common/smihandler.c<br>M src/southbridge/intel/ibexpeak/smihandler.c<br>M src/southbridge/intel/lynxpoint/smihandler.c<br>11 files changed, 19 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/30022/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 379b512..857ab35 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_ELOG_GSMI 0xef</span><br><span> #define APM_STS 0xb3</span><br><span> </span><br><span> /* SMI handler function prototypes */</span><br><span>diff --git a/src/include/elog.h b/src/include/elog.h</span><br><span>index 8aecf2c..31891e0 100644</span><br><span>--- a/src/include/elog.h</span><br><span>+++ b/src/include/elog.h</span><br><span>@@ -16,9 +16,6 @@</span><br><span> #ifndef ELOG_H_</span><br><span> #define ELOG_H_</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* SMI command code for GSMI event logging */</span><br><span style="color: hsl(0, 100%, 40%);">-#define ELOG_GSMI_APM_CNT 0xEF</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #define MAX_EVENT_SIZE 0x7F</span><br><span> </span><br><span> /* End of log */</span><br><span>diff --git a/src/soc/amd/stoneyridge/smihandler.c b/src/soc/amd/stoneyridge/smihandler.c</span><br><span>index a5e66a8..a662bc5d 100644</span><br><span>--- a/src/soc/amd/stoneyridge/smihandler.c</span><br><span>+++ b/src/soc/amd/stoneyridge/smihandler.c</span><br><span>@@ -72,7 +72,7 @@</span><br><span> amd64_smm_state_save_area_t *io_smi;</span><br><span> u32 reg_ebx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- io_smi = find_save_state(ELOG_GSMI_APM_CNT);</span><br><span style="color: hsl(120, 100%, 40%);">+ io_smi = find_save_state(APM_CNT_ELOG_GSMI);</span><br><span> if (!io_smi)</span><br><span> return;</span><br><span> /* Command and return value in EAX */</span><br><span>@@ -101,7 +101,7 @@</span><br><span> reg32 &= ~(1 << 0); /* clear SCI_EN */</span><br><span> acpi_write32(MMIO_ACPI_PM1_CNT_BLK, reg32);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case ELOG_GSMI_APM_CNT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case APM_CNT_ELOG_GSMI:</span><br><span> if (IS_ENABLED(CONFIG_ELOG_GSMI))</span><br><span> southbridge_smi_gsmi();</span><br><span> break;</span><br><span>diff --git a/src/soc/intel/baytrail/smihandler.c b/src/soc/intel/baytrail/smihandler.c</span><br><span>index c222739..3f8727d 100644</span><br><span>--- a/src/soc/intel/baytrail/smihandler.c</span><br><span>+++ b/src/soc/intel/baytrail/smihandler.c</span><br><span>@@ -214,7 +214,7 @@</span><br><span> u32 *ret, *param;</span><br><span> uint8_t sub_command;</span><br><span> em64t100_smm_state_save_area_t *io_smi =</span><br><span style="color: hsl(0, 100%, 40%);">- smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);</span><br><span style="color: hsl(120, 100%, 40%);">+ smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);</span><br><span> </span><br><span> if (!io_smi)</span><br><span> return;</span><br><span>@@ -347,7 +347,7 @@</span><br><span> }</span><br><span> break;</span><br><span> #if IS_ENABLED(CONFIG_ELOG_GSMI)</span><br><span style="color: hsl(0, 100%, 40%);">- case ELOG_GSMI_APM_CNT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case APM_CNT_ELOG_GSMI:</span><br><span> southbridge_smi_gsmi();</span><br><span> break;</span><br><span> #endif</span><br><span>diff --git a/src/soc/intel/braswell/smihandler.c b/src/soc/intel/braswell/smihandler.c</span><br><span>index edbb766..a4d2d88 100644</span><br><span>--- a/src/soc/intel/braswell/smihandler.c</span><br><span>+++ b/src/soc/intel/braswell/smihandler.c</span><br><span>@@ -263,7 +263,7 @@</span><br><span> u32 *ret, *param;</span><br><span> uint8_t sub_command;</span><br><span> em64t100_smm_state_save_area_t *io_smi =</span><br><span style="color: hsl(0, 100%, 40%);">- smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);</span><br><span style="color: hsl(120, 100%, 40%);">+ smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);</span><br><span> </span><br><span> if (!io_smi)</span><br><span> return;</span><br><span>@@ -344,7 +344,7 @@</span><br><span> }</span><br><span> break;</span><br><span> #if IS_ENABLED(CONFIG_ELOG_GSMI)</span><br><span style="color: hsl(0, 100%, 40%);">- case ELOG_GSMI_APM_CNT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case APM_CNT_ELOG_GSMI:</span><br><span> southbridge_smi_gsmi();</span><br><span> break;</span><br><span> #endif</span><br><span>diff --git a/src/soc/intel/broadwell/smihandler.c b/src/soc/intel/broadwell/smihandler.c</span><br><span>index 24f6a3d..64a315d 100644</span><br><span>--- a/src/soc/intel/broadwell/smihandler.c</span><br><span>+++ b/src/soc/intel/broadwell/smihandler.c</span><br><span>@@ -300,7 +300,7 @@</span><br><span> u32 *ret, *param;</span><br><span> u8 sub_command;</span><br><span> em64t101_smm_state_save_area_t *io_smi =</span><br><span style="color: hsl(0, 100%, 40%);">- smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);</span><br><span style="color: hsl(120, 100%, 40%);">+ smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);</span><br><span> </span><br><span> if (!io_smi)</span><br><span> return;</span><br><span>@@ -374,7 +374,7 @@</span><br><span> }</span><br><span> break;</span><br><span> #if IS_ENABLED(CONFIG_ELOG_GSMI)</span><br><span style="color: hsl(0, 100%, 40%);">- case ELOG_GSMI_APM_CNT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case APM_CNT_ELOG_GSMI:</span><br><span> southbridge_smi_gsmi();</span><br><span> break;</span><br><span> #endif</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 0832bb5..093c50e 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>@@ -279,7 +279,7 @@</span><br><span> void *io_smi = NULL;</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, ELOG_GSMI_APM_CNT);</span><br><span style="color: hsl(120, 100%, 40%);">+ io_smi = find_save_state(save_state_ops, APM_CNT_ELOG_GSMI);</span><br><span> if (!io_smi)</span><br><span> return;</span><br><span> /* Command and return value in EAX */</span><br><span>@@ -387,7 +387,7 @@</span><br><span> printk(BIOS_DEBUG, "SMI#: Setting GNVS to %p\n", gnvs);</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case ELOG_GSMI_APM_CNT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case APM_CNT_ELOG_GSMI:</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>diff --git a/src/soc/intel/fsp_baytrail/smihandler.c b/src/soc/intel/fsp_baytrail/smihandler.c</span><br><span>index 48c828b..e8021ce 100644</span><br><span>--- a/src/soc/intel/fsp_baytrail/smihandler.c</span><br><span>+++ b/src/soc/intel/fsp_baytrail/smihandler.c</span><br><span>@@ -212,7 +212,7 @@</span><br><span> u32 *ret, *param;</span><br><span> uint8_t sub_command;</span><br><span> em64t100_smm_state_save_area_t *io_smi =</span><br><span style="color: hsl(0, 100%, 40%);">- smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);</span><br><span style="color: hsl(120, 100%, 40%);">+ smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);</span><br><span> </span><br><span> if (!io_smi)</span><br><span> return;</span><br><span>@@ -274,7 +274,7 @@</span><br><span> }</span><br><span> break;</span><br><span> #if IS_ENABLED(CONFIG_ELOG_GSMI)</span><br><span style="color: hsl(0, 100%, 40%);">- case ELOG_GSMI_APM_CNT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case APM_CNT_ELOG_GSMI:</span><br><span> southbridge_smi_gsmi();</span><br><span> break;</span><br><span> #endif</span><br><span>diff --git a/src/southbridge/intel/common/smihandler.c b/src/southbridge/intel/common/smihandler.c</span><br><span>index 0ad400c..6347ad6 100644</span><br><span>--- a/src/southbridge/intel/common/smihandler.c</span><br><span>+++ b/src/southbridge/intel/common/smihandler.c</span><br><span>@@ -249,7 +249,7 @@</span><br><span> u32 *ret, *param;</span><br><span> u8 sub_command;</span><br><span> em64t101_smm_state_save_area_t *io_smi =</span><br><span style="color: hsl(0, 100%, 40%);">- smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);</span><br><span style="color: hsl(120, 100%, 40%);">+ smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);</span><br><span> </span><br><span> if (!io_smi)</span><br><span> return;</span><br><span>@@ -316,7 +316,7 @@</span><br><span> mainboard_finalized = 1;</span><br><span> break;</span><br><span> #if IS_ENABLED(CONFIG_ELOG_GSMI)</span><br><span style="color: hsl(0, 100%, 40%);">- case ELOG_GSMI_APM_CNT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case APM_CNT_ELOG_GSMI:</span><br><span> southbridge_smi_gsmi();</span><br><span> break;</span><br><span> #endif</span><br><span>diff --git a/src/southbridge/intel/ibexpeak/smihandler.c b/src/southbridge/intel/ibexpeak/smihandler.c</span><br><span>index b70273c..e510f19 100644</span><br><span>--- a/src/southbridge/intel/ibexpeak/smihandler.c</span><br><span>+++ b/src/southbridge/intel/ibexpeak/smihandler.c</span><br><span>@@ -537,7 +537,7 @@</span><br><span> u32 *ret, *param;</span><br><span> u8 sub_command;</span><br><span> em64t101_smm_state_save_area_t *io_smi =</span><br><span style="color: hsl(0, 100%, 40%);">- smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);</span><br><span style="color: hsl(120, 100%, 40%);">+ smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);</span><br><span> </span><br><span> if (!io_smi)</span><br><span> return;</span><br><span>@@ -604,7 +604,7 @@</span><br><span> }</span><br><span> break;</span><br><span> #if IS_ENABLED(CONFIG_ELOG_GSMI)</span><br><span style="color: hsl(0, 100%, 40%);">- case ELOG_GSMI_APM_CNT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case APM_CNT_ELOG_GSMI:</span><br><span> southbridge_smi_gsmi();</span><br><span> break;</span><br><span> #endif</span><br><span>diff --git a/src/southbridge/intel/lynxpoint/smihandler.c b/src/southbridge/intel/lynxpoint/smihandler.c</span><br><span>index a3965d0..72298f3 100644</span><br><span>--- a/src/southbridge/intel/lynxpoint/smihandler.c</span><br><span>+++ b/src/southbridge/intel/lynxpoint/smihandler.c</span><br><span>@@ -253,7 +253,7 @@</span><br><span> u32 *ret, *param;</span><br><span> u8 sub_command;</span><br><span> em64t101_smm_state_save_area_t *io_smi =</span><br><span style="color: hsl(0, 100%, 40%);">- smi_apmc_find_state_save(ELOG_GSMI_APM_CNT);</span><br><span style="color: hsl(120, 100%, 40%);">+ smi_apmc_find_state_save(APM_CNT_ELOG_GSMI);</span><br><span> </span><br><span> if (!io_smi)</span><br><span> return;</span><br><span>@@ -333,7 +333,7 @@</span><br><span> usb_xhci_route_all();</span><br><span> break;</span><br><span> #if IS_ENABLED(CONFIG_ELOG_GSMI)</span><br><span style="color: hsl(0, 100%, 40%);">- case ELOG_GSMI_APM_CNT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case APM_CNT_ELOG_GSMI:</span><br><span> southbridge_smi_gsmi();</span><br><span> break;</span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30022">change 30022</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/+/30022"/><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: I3a3e2f823c91b475d1e15b8c20e9cf5f3fd9de83 </div>
<div style="display:none"> Gerrit-Change-Number: 30022 </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>