<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27279">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">intel: Get rid of smm_get_pmbase<br><br>Change-Id: I2b3168c600a81502f9cd1ff3203c492cf026e532<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M src/include/cpu/x86/smm.h<br>M src/mainboard/google/stout/ec.c<br>M src/southbridge/intel/common/smihandler.c<br>M src/southbridge/intel/fsp_bd82x6x/smihandler.c<br>M src/southbridge/intel/fsp_i89xx/smihandler.c<br>M src/southbridge/intel/ibexpeak/smihandler.c<br>6 files changed, 2 insertions(+), 40 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/27279/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 7dcf4d7..35977a7 100644</span><br><span>--- a/src/include/cpu/x86/smm.h</span><br><span>+++ b/src/include/cpu/x86/smm.h</span><br><span>@@ -508,9 +508,6 @@</span><br><span> extern unsigned char _binary_smm_start[];</span><br><span> extern unsigned char _binary_smm_end[];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Get PMBASE address */</span><br><span style="color: hsl(0, 100%, 40%);">-u16 smm_get_pmbase(void);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct smm_runtime {</span><br><span>     u32 smbase;</span><br><span>  u32 save_state_size;</span><br><span>diff --git a/src/mainboard/google/stout/ec.c b/src/mainboard/google/stout/ec.c</span><br><span>index a459d0c..229f919 100644</span><br><span>--- a/src/mainboard/google/stout/ec.c</span><br><span>+++ b/src/mainboard/google/stout/ec.c</span><br><span>@@ -22,6 +22,7 @@</span><br><span> #include <device/device.h></span><br><span> #include <device/pci.h></span><br><span> #include <southbridge/intel/bd82x6x/pch.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <southbridge/intel/common/pmbase.h></span><br><span> #include <elog.h></span><br><span> #include "ec.h"</span><br><span> </span><br><span>@@ -64,7 +65,6 @@</span><br><span> void stout_ec_finalize_smm(void)</span><br><span> {</span><br><span>      u8 ec_reg, critical_shutdown = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-       u32 pm1_cnt;</span><br><span> </span><br><span>     /*</span><br><span>    * Check EC for error conditions.</span><br><span>@@ -115,9 +115,7 @@</span><br><span>              printk(BIOS_ERR, "EC critical_shutdown");</span><br><span> </span><br><span>              /* Go to S5 */</span><br><span style="color: hsl(0, 100%, 40%);">-          pm1_cnt = inl(smm_get_pmbase() + PM1_CNT);</span><br><span style="color: hsl(0, 100%, 40%);">-              pm1_cnt |= (0xf << 10);</span><br><span style="color: hsl(0, 100%, 40%);">-           outl(pm1_cnt, smm_get_pmbase() + PM1_CNT);</span><br><span style="color: hsl(120, 100%, 40%);">+            write_pmbase32(PM1_CNT, read_pmbase32(PM1_CNT) | (0xf << 10));</span><br><span>         }</span><br><span> }</span><br><span> #endif //__SMM__</span><br><span>diff --git a/src/southbridge/intel/common/smihandler.c b/src/southbridge/intel/common/smihandler.c</span><br><span>index 234a1c5..a5ebf25 100644</span><br><span>--- a/src/southbridge/intel/common/smihandler.c</span><br><span>+++ b/src/southbridge/intel/common/smihandler.c</span><br><span>@@ -32,12 +32,6 @@</span><br><span> </span><br><span> static u16 pmbase;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Defined in <cpu/x86/smm.h> which is used outside of common code*/</span><br><span style="color: hsl(0, 100%, 40%);">-u16 smm_get_pmbase(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-       return get_pmbase();</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void gpi_route_interrupt(u8 gpi, u8 mode)</span><br><span> {</span><br><span>      u32 gpi_rout;</span><br><span>diff --git a/src/southbridge/intel/fsp_bd82x6x/smihandler.c b/src/southbridge/intel/fsp_bd82x6x/smihandler.c</span><br><span>index c868ec6..7eb108a 100644</span><br><span>--- a/src/southbridge/intel/fsp_bd82x6x/smihandler.c</span><br><span>+++ b/src/southbridge/intel/fsp_bd82x6x/smihandler.c</span><br><span>@@ -33,15 +33,6 @@</span><br><span>  */</span><br><span> #include <northbridge/intel/fsp_sandybridge/northbridge.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* While we read PMBASE dynamically in case it changed, let's</span><br><span style="color: hsl(0, 100%, 40%);">- * initialize it with a sane value</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-static u16 pmbase = DEFAULT_PMBASE;</span><br><span style="color: hsl(0, 100%, 40%);">-u16 smm_get_pmbase(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-        return pmbase;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static u8 smm_initialized = 0;</span><br><span> </span><br><span> /* GNVS needs to be updated by an 0xEA PM Trap (B2) after it has been located</span><br><span>diff --git a/src/southbridge/intel/fsp_i89xx/smihandler.c b/src/southbridge/intel/fsp_i89xx/smihandler.c</span><br><span>index 0ef7ba8..870e442 100644</span><br><span>--- a/src/southbridge/intel/fsp_i89xx/smihandler.c</span><br><span>+++ b/src/southbridge/intel/fsp_i89xx/smihandler.c</span><br><span>@@ -33,15 +33,6 @@</span><br><span>  */</span><br><span> #include <northbridge/intel/fsp_sandybridge/northbridge.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* While we read PMBASE dynamically in case it changed, let's</span><br><span style="color: hsl(0, 100%, 40%);">- * initialize it with a sane value</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-static u16 pmbase = DEFAULT_PMBASE;</span><br><span style="color: hsl(0, 100%, 40%);">-u16 smm_get_pmbase(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-       return pmbase;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static u8 smm_initialized = 0;</span><br><span> </span><br><span> /* GNVS needs to be updated by an 0xEA PM Trap (B2) after it has been located</span><br><span>diff --git a/src/southbridge/intel/ibexpeak/smihandler.c b/src/southbridge/intel/ibexpeak/smihandler.c</span><br><span>index 12a7ac0..eb72e6b 100644</span><br><span>--- a/src/southbridge/intel/ibexpeak/smihandler.c</span><br><span>+++ b/src/southbridge/intel/ibexpeak/smihandler.c</span><br><span>@@ -36,15 +36,6 @@</span><br><span> #include <southbridge/intel/common/gpio.h></span><br><span> #include <arch/io.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* While we read PMBASE dynamically in case it changed, let's</span><br><span style="color: hsl(0, 100%, 40%);">- * initialize it with a sane value</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-static u16 pmbase = DEFAULT_PMBASE;</span><br><span style="color: hsl(0, 100%, 40%);">-u16 smm_get_pmbase(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-    return pmbase;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static u8 smm_initialized = 0;</span><br><span> </span><br><span> /* GNVS needs to be updated by an 0xEA PM Trap (B2) after it has been located</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27279">change 27279</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/27279"/><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: I2b3168c600a81502f9cd1ff3203c492cf026e532 </div>
<div style="display:none"> Gerrit-Change-Number: 27279 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>