<p>Marshall Dawson has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22884">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/common: Make reading AGESA event log static<br><br>The function agesawrapper_amdreadeventlog() is only called from within<br>agesawrapper.c. Make it a static function and:<br> * shorten the name to help keep lines within 80 columns<br> * convert initializers to C99<br> * break the call from the callers' if() statements<br> * streamline the printk formatting<br><br>BUG=b:70671442<br>TEST=Build and run Kahlee, check console log<br><br>Change-Id: I402c75e4d65a592b9d1557c5852df03e48e206b9<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/soc/amd/common/block/include/amdblocks/agesawrapper.h<br>M src/soc/amd/common/block/pi/agesawrapper.c<br>2 files changed, 40 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/22884/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h<br>index 08ac596..d16e9ff 100644<br>--- a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h<br>+++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h<br>@@ -40,7 +40,6 @@<br> AGESA_STATUS agesawrapper_amdinitlate(void);<br> AGESA_STATUS agesawrapper_amdinitpost(void);<br> AGESA_STATUS agesawrapper_amdinitmid(void);<br>-AGESA_STATUS agesawrapper_amdreadeventlog(UINT8 HeapStatus);<br> void *agesawrapper_getlateinitptr(int pick);<br> AGESA_STATUS agesawrapper_amdlaterunaptask(UINT32 Func, UINTN Data,<br> void *ConfigPtr);<br>diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c<br>index cc57207..b9931d2 100644<br>--- a/src/soc/amd/common/block/pi/agesawrapper.c<br>+++ b/src/soc/amd/common/block/pi/agesawrapper.c<br>@@ -40,6 +40,34 @@<br> static void *AcpiCrat;<br> #endif /* #ifndef __PRE_RAM__ */<br> <br>+static AGESA_STATUS agesawrapper_readeventlog(UINT8 HeapStatus)<br>+{<br>+ AGESA_STATUS Status;<br>+ EVENT_PARAMS AmdEventParams = {<br>+ .StdHeader.CalloutPtr = &GetBiosCallout,<br>+ .StdHeader.HeapStatus = HeapStatus,<br>+ };<br>+<br>+ Status = AmdReadEventLog(&AmdEventParams);<br>+ if (AmdEventParams.EventClass)<br>+ printk(BIOS_DEBUG, "AGESA Event Log:\n");<br>+<br>+ while (AmdEventParams.EventClass != 0) {<br>+ printk(BIOS_DEBUG, " Class = %x, Info = %x,"<br>+ " Param1 = 0x%x, Param2 = 0x%x"<br>+ " Param3 = 0x%x, Param4 = 0x%x\n",<br>+ (u32)AmdEventParams.EventClass,<br>+ (u32)AmdEventParams.EventInfo,<br>+ (u32)AmdEventParams.DataParam1,<br>+ (u32)AmdEventParams.DataParam2,<br>+ (u32)AmdEventParams.DataParam3,<br>+ (u32)AmdEventParams.DataParam4);<br>+ Status = AmdReadEventLog(&AmdEventParams);<br>+ }<br>+<br>+ return Status;<br>+}<br>+<br> AGESA_STATUS agesawrapper_amdinitreset(void)<br> {<br> AGESA_STATUS status;<br>@@ -68,7 +96,8 @@<br> status = AmdInitReset(&AmdResetParams);<br> timestamp_add_now(TS_AGESA_INIT_RESET_DONE);<br> <br>- if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);<br>+ if (status != AGESA_SUCCESS)<br>+ agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);<br> AmdReleaseStruct (&AmdParamStruct);<br> return status;<br> }<br>@@ -98,7 +127,8 @@<br> status = AmdInitEarly ((AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr);<br> timestamp_add_now(TS_AGESA_INIT_EARLY_DONE);<br> <br>- if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);<br>+ if (status != AGESA_SUCCESS)<br>+ agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);<br> AmdReleaseStruct (&AmdParamStruct);<br> <br> return status;<br>@@ -169,7 +199,8 @@<br> (unsigned long)(PostParams->MemConfig.UmaBase) << 16<br> );<br> <br>- if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(PostParams->StdHeader.HeapStatus);<br>+ if (status != AGESA_SUCCESS)<br>+ agesawrapper_readeventlog(PostParams->StdHeader.HeapStatus);<br> AmdReleaseStruct (&AmdParamStruct);<br> <br> return status;<br>@@ -203,7 +234,8 @@<br> status = AmdInitEnv (EnvParam);<br> timestamp_add_now(TS_AGESA_INIT_ENV_DONE);<br> <br>- if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(EnvParam->StdHeader.HeapStatus);<br>+ if (status != AGESA_SUCCESS)<br>+ agesawrapper_readeventlog(EnvParam->StdHeader.HeapStatus);<br> /* Initialize Subordinate Bus Number and Secondary Bus Number<br> * In platform BIOS this address is allocated by PCI enumeration code<br> Modify D1F0x18<br>@@ -274,7 +306,8 @@<br> status = AmdInitMid ((AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr);<br> timestamp_add_now(TS_AGESA_INIT_MID_DONE);<br> <br>- if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);<br>+ if (status != AGESA_SUCCESS)<br>+ agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);<br> AmdReleaseStruct (&AmdParamStruct);<br> <br> return status;<br>@@ -306,7 +339,7 @@<br> timestamp_add_now(TS_AGESA_INIT_LATE_DONE);<br> <br> if (Status != AGESA_SUCCESS) {<br>- agesawrapper_amdreadeventlog(AmdLateParams->StdHeader.HeapStatus);<br>+ agesawrapper_readeventlog(AmdLateParams->StdHeader.HeapStatus);<br> ASSERT(Status == AGESA_SUCCESS);<br> }<br> <br>@@ -351,31 +384,8 @@<br> <br> Status = AmdLateRunApTask (&ApExeParams);<br> if (Status != AGESA_SUCCESS) {<br>- /* agesawrapper_amdreadeventlog(); */<br>+ /* agesawrapper_readeventlog(); */<br> ASSERT(Status == AGESA_SUCCESS);<br>- }<br>-<br>- return Status;<br>-}<br>-<br>-AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus)<br>-{<br>- AGESA_STATUS Status;<br>- EVENT_PARAMS AmdEventParams;<br>-<br>- memset(&AmdEventParams, 0, sizeof(AmdEventParams));<br>-<br>- AmdEventParams.StdHeader.AltImageBasePtr = 0;<br>- AmdEventParams.StdHeader.CalloutPtr = &GetBiosCallout;<br>- AmdEventParams.StdHeader.Func = 0;<br>- AmdEventParams.StdHeader.ImageBasePtr = 0;<br>- AmdEventParams.StdHeader.HeapStatus = HeapStatus;<br>- Status = AmdReadEventLog (&AmdEventParams);<br>- while (AmdEventParams.EventClass != 0) {<br>- printk(BIOS_DEBUG,"\nEventLog: EventClass = %x, EventInfo = %x.\n", (unsigned int)AmdEventParams.EventClass,(unsigned int)AmdEventParams.EventInfo);<br>- printk(BIOS_DEBUG," Param1 = %x, Param2 = %x.\n",(unsigned int)AmdEventParams.DataParam1, (unsigned int)AmdEventParams.DataParam2);<br>- printk(BIOS_DEBUG," Param3 = %x, Param4 = %x.\n",(unsigned int)AmdEventParams.DataParam3, (unsigned int)AmdEventParams.DataParam4);<br>- Status = AmdReadEventLog (&AmdEventParams);<br> }<br> <br> return Status;<br></pre><p>To view, visit <a href="https://review.coreboot.org/22884">change 22884</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/22884"/><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: I402c75e4d65a592b9d1557c5852df03e48e206b9 </div>
<div style="display:none"> Gerrit-Change-Number: 22884 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>