<p>Marshall Dawson has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22887">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/common: Move InitPost printed results<br><br>Make a static function that can report the AmdInitPost() results. This<br>makes it easier to keep lines within 80 columns. Clean up surrounding<br>source.<br><br>BUG=b:62240746<br>TEST=Build and boot Kahlee<br><br>Change-Id: I6d288e76e7510528659436e61fdfa1d5db01f06c<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/soc/amd/common/block/pi/agesawrapper.c<br>1 file changed, 46 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/22887/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c<br>index 4a3e527..a4e1a17 100644<br>--- a/src/soc/amd/common/block/pi/agesawrapper.c<br>+++ b/src/soc/amd/common/block/pi/agesawrapper.c<br>@@ -133,6 +133,43 @@<br> return status;<br> }<br> <br>+static void print_init_post_settings(AMD_POST_PARAMS *parms)<br>+{<br>+ u64 syslimit, bottomio, uma_size, uma_start;<br>+ const char *uma_auto = "UMA_AUTO";<br>+ const char *uma_specified = "UMA_SPECIFIED";<br>+ const char *uma_none = "UMA_NONE";<br>+ const char *uma_unknown = "unknown";<br>+ const char *mode;<br>+<br>+ switch (parms->MemConfig.UmaMode) {<br>+ case UMA_AUTO:<br>+ mode = uma_auto;<br>+ break;<br>+ case UMA_SPECIFIED:<br>+ mode = uma_specified;<br>+ break;<br>+ case UMA_NONE:<br>+ mode = uma_none;<br>+ break;<br>+ default:<br>+ mode = uma_unknown;<br>+ break;<br>+ }<br>+<br>+ syslimit = (u64)parms->MemConfig.SysLimit * 64 * KiB;<br>+ bottomio = (u64)parms->MemConfig.BottomIo * 64 * KiB;<br>+<br>+ uma_size = (u64)parms->MemConfig.UmaSize * 64 * KiB;<br>+ uma_start = (u64)parms->MemConfig.UmaBase * 64 * KiB;<br>+<br>+ printk(BIOS_SPEW, "AGESA set: umamode %s\n", mode);<br>+ printk(BIOS_SPEW, " : syslimit 0x%llx, bottomio 0x%08llx\n",<br>+ syslimit, bottomio);<br>+ printk(BIOS_SPEW, " : uma size %lluMB, uma start 0x%08llx\n",<br>+ uma_size / MiB, uma_start);<br>+}<br>+<br> AGESA_STATUS agesawrapper_amdinitpost(void)<br> {<br> AGESA_STATUS status;<br>@@ -168,35 +205,19 @@<br> status = AmdInitPost (PostParams);<br> timestamp_add_now(TS_AGESA_INIT_POST_DONE);<br> <br>- /* If UMA is enabled we currently have it below TOP_MEM as well.<br>+ /*<br>+ * If UMA is enabled we currently have it below TOP_MEM as well.<br> * UMA may or may not be cacheable, so Sub4GCacheTop could be<br>- * higher than UmaBase. With UMA_NONE we see UmaBase==0. */<br>+ * higher than UmaBase. With UMA_NONE we see UmaBase==0.<br>+ */<br>+ uintptr_t top;<br> if (PostParams->MemConfig.UmaBase)<br>- backup_top_of_low_cacheable(PostParams->MemConfig.UmaBase << 16);<br>+ top = PostParams->MemConfig.UmaBase << 16;<br> else<br>- backup_top_of_low_cacheable(PostParams->MemConfig.Sub4GCacheTop);<br>+ top = PostParams->MemConfig.Sub4GCacheTop;<br>+ backup_top_of_low_cacheable(top);<br> <br>-<br>- printk(<br>- BIOS_SPEW,<br>- "setup_uma_memory: umamode %s\n",<br>- (PostParams->MemConfig.UmaMode == UMA_AUTO) ? "UMA_AUTO" :<br>- (PostParams->MemConfig.UmaMode == UMA_SPECIFIED) ? "UMA_SPECIFIED" :<br>- (PostParams->MemConfig.UmaMode == UMA_NONE) ? "UMA_NONE" :<br>- "unknown"<br>- );<br>- printk(<br>- BIOS_SPEW,<br>- "setup_uma_memory: syslimit 0x%08llX, bottomio 0x%08lx\n",<br>- (unsigned long long)(PostParams->MemConfig.SysLimit) << 16,<br>- (unsigned long)(PostParams->MemConfig.BottomIo) << 16<br>- );<br>- printk(<br>- BIOS_SPEW,<br>- "setup_uma_memory: uma size %luMB, uma start 0x%08lx\n",<br>- (unsigned long)(PostParams->MemConfig.UmaSize) >> (20 - 16),<br>- (unsigned long)(PostParams->MemConfig.UmaBase) << 16<br>- );<br>+ print_init_post_settings(PostParams);<br> <br> if (status != AGESA_SUCCESS)<br> agesawrapper_readeventlog(PostParams->StdHeader.HeapStatus);<br></pre><p>To view, visit <a href="https://review.coreboot.org/22887">change 22887</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/22887"/><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: I6d288e76e7510528659436e61fdfa1d5db01f06c </div>
<div style="display:none"> Gerrit-Change-Number: 22887 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>