<p>Subrata Banik has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21291">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/apollolake: Use SMM library to get tseg region information<br><br>This patch uses smm common library function to get tseg base<br>address and size. Hence removing definitions of smm_region()<br>from soc directory.<br><br>BRANCH=none<br>BUG=b:63974384<br>TEST=Build and boot reef successfully.<br><br>Change-Id: I091ca90cf576c0da35cf3fe010f8c22a18ef82d9<br>Signed-off-by: Subrata Banik <subrata.banik@intel.com><br>---<br>M src/soc/intel/apollolake/cpu.c<br>M src/soc/intel/apollolake/memmap.c<br>M src/soc/intel/apollolake/romstage.c<br>3 files changed, 8 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/21291/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c<br>index 98cd23a..0401696 100644<br>--- a/src/soc/intel/apollolake/cpu.c<br>+++ b/src/soc/intel/apollolake/cpu.c<br>@@ -178,7 +178,7 @@<br>   const uint32_t rmask = ~((1 << 12) - 1);<br> <br>     /* Initialize global tracking state. */<br>-      smm_region(&smm_base, &smm_size);<br>+    smm_region_info(&smm_base, &smm_size);<br>        smm_subregion(SMM_SUBREGION_HANDLER, &handler_base, &handler_size);<br> <br>        relo_attrs.smbase = (uint32_t)smm_base;<br>diff --git a/src/soc/intel/apollolake/memmap.c b/src/soc/intel/apollolake/memmap.c<br>index c54423c..f9a484a 100644<br>--- a/src/soc/intel/apollolake/memmap.c<br>+++ b/src/soc/intel/apollolake/memmap.c<br>@@ -28,40 +28,24 @@<br> #include <cbmem.h><br> #include <device/pci.h><br> #include <fsp/memmap.h><br>+#include <intelblocks/smm.h><br> #include <soc/systemagent.h><br> #include <soc/pci_devs.h><br> <br>-static uintptr_t smm_region_start(void)<br>-{<br>-    return ALIGN_DOWN(pci_read_config32(SA_DEV_ROOT, TSEG), 1*MiB);<br>-}<br>-<br>-static size_t smm_region_size(void)<br>-{<br>-     uintptr_t smm_end =<br>-          ALIGN_DOWN(pci_read_config32(SA_DEV_ROOT, BGSM), 1*MiB);<br>-     return smm_end - smm_region_start();<br>-}<br>-<br> void *cbmem_top(void)<br> {<br>-      return (void *)smm_region_start();<br>-}<br>-<br>-void smm_region(void **start, size_t *size)<br>-{<br>-  *start = (void *)smm_region_start();<br>- *size = smm_region_size();<br>+   return (void *)sa_get_tseg_base();<br> }<br> <br> int smm_subregion(int sub, void **start, size_t *size)<br> {<br>        uintptr_t sub_base;<br>   size_t sub_size;<br>+     void *smm_base;<br>       const size_t cache_size = CONFIG_SMM_RESERVED_SIZE;<br> <br>-       sub_base = smm_region_start();<br>-       sub_size = smm_region_size();<br>+        smm_region_info(&smm_base, &sub_size);<br>+       sub_base = (uintptr_t)smm_base;<br> <br>    assert(sub_size > CONFIG_SMM_RESERVED_SIZE);<br> <br>diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c<br>index 2017d84..605a75b 100644<br>--- a/src/soc/intel/apollolake/romstage.c<br>+++ b/src/soc/intel/apollolake/romstage.c<br>@@ -33,6 +33,7 @@<br> #include <fsp/memmap.h><br> #include <fsp/util.h><br> #include <intelblocks/cpulib.h><br>+#include <intelblocks/smm.h><br> #include <intelblocks/systemagent.h><br> #include <intelblocks/pmclib.h><br> #include <reset.h><br>@@ -269,7 +270,7 @@<br>    * when relocating the SMM handler as well as using the TSEG<br>   * region for other purposes.<br>  */<br>-   smm_region(&smm_base, &smm_size);<br>+    smm_region_info(&smm_base, &smm_size);<br>        tseg_base = (uintptr_t)smm_base;<br>      postcar_frame_add_mtrr(&pcf, tseg_base, smm_size, MTRR_TYPE_WRBACK);<br> <br></pre><p>To view, visit <a href="https://review.coreboot.org/21291">change 21291</a>. To unsubscribe, 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/21291"/><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: I091ca90cf576c0da35cf3fe010f8c22a18ef82d9 </div>
<div style="display:none"> Gerrit-Change-Number: 21291 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Subrata Banik <subrata.banik@intel.com> </div>