<p>Marshall Dawson has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22889">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/common: Improve misc. formatting in AGESA wrapper<br><br>Improve the file with:<br> * C99 inializations for structures<br> * reorder include files for aesthetics<br> * remove extraneous whitespace<br> * update comments<br><br>This change clears up all remaining checkpatch issues with the wrapper<br>with the exception of errors created with AMD definitions, e.g.<br> ERROR: need consistent spacing around '*' (ctx:WxV)<br> #32: FILE: src/soc/amd/common/block/pi/agesawrapper.c:32:<br> void __attribute__((weak)) SetFchMidParams(FCH_INTERFACE *params) {}<br><br>BUG=b:62240746<br>TEST=Build and boot Kahlee<br><br>Change-Id: I40985e0cf50df6aa4d830937e7f6b6e7908f72fe<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/soc/amd/common/block/pi/agesawrapper.c<br>1 file changed, 69 insertions(+), 98 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/22889/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 87dfd56..5e07939 100644<br>--- a/src/soc/amd/common/block/pi/agesawrapper.c<br>+++ b/src/soc/amd/common/block/pi/agesawrapper.c<br>@@ -13,15 +13,16 @@<br> * GNU General Public License for more details.<br> */<br> <br>-#include <amdblocks/agesawrapper.h><br> #include <arch/early_variables.h><br> #include <cbfs.h><br> #include <cbmem.h><br> #include <delay.h><br>-#include <cpu/x86/mtrr.h><br>-#include <amdblocks/BiosCallOuts.h><br> #include <string.h><br> #include <timestamp.h><br>+#include <cpu/x86/mtrr.h><br>+#include <soc/iomap.h><br>+#include <amdblocks/agesawrapper.h><br>+#include <amdblocks/BiosCallOuts.h><br> <br> void __attribute__((weak)) SetFchResetParams(FCH_RESET_INTERFACE *params) {}<br> void __attribute__((weak)) SetMemParams(AMD_POST_PARAMS *PostParams) {}<br>@@ -73,22 +74,15 @@<br> AGESA_STATUS agesawrapper_amdinitreset(void)<br> {<br> AGESA_STATUS status;<br>- AMD_INTERFACE_PARAMS AmdParamStruct;<br> AMD_RESET_PARAMS AmdResetParams;<br>-<br>- memset(&AmdParamStruct, 0, sizeof(AmdParamStruct));<br>- memset(&AmdResetParams, 0, sizeof(AmdResetParams));<br>-<br>- AmdParamStruct.AgesaFunctionName = AMD_INIT_RESET;<br>- AmdParamStruct.AllocationMethod = ByHost;<br>- AmdParamStruct.NewStructSize = sizeof(AMD_RESET_PARAMS);<br>- AmdParamStruct.NewStructPtr = &AmdResetParams;<br>- AmdParamStruct.StdHeader.AltImageBasePtr = 0;<br>- AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;<br>- AmdParamStruct.StdHeader.Func = 0;<br>- AmdParamStruct.StdHeader.ImageBasePtr = 0;<br>- AmdCreateStruct (&AmdParamStruct);<br>-<br>+ AMD_INTERFACE_PARAMS AmdParamStruct = {<br>+ .AgesaFunctionName = AMD_INIT_RESET,<br>+ .AllocationMethod = ByHost,<br>+ .NewStructSize = sizeof(AMD_RESET_PARAMS),<br>+ .NewStructPtr = &AmdResetParams,<br>+ .StdHeader.CalloutPtr = &GetBiosCallout<br>+ };<br>+ AmdCreateStruct(&AmdParamStruct);<br> SetFchResetParams(&AmdResetParams.FchInterface);<br> <br> timestamp_add_now(TS_AGESA_INIT_RESET_START);<br>@@ -97,38 +91,34 @@<br> <br> if (status != AGESA_SUCCESS)<br> agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);<br>- AmdReleaseStruct (&AmdParamStruct);<br>+ AmdReleaseStruct(&AmdParamStruct);<br> return status;<br> }<br> <br> AGESA_STATUS agesawrapper_amdinitearly(void)<br> {<br> AGESA_STATUS status;<br>- AMD_INTERFACE_PARAMS AmdParamStruct;<br>- AMD_EARLY_PARAMS *AmdEarlyParamsPtr;<br>+ AMD_EARLY_PARAMS *AmdEarlyParamsPtr;<br>+ AMD_INTERFACE_PARAMS AmdParamStruct = {<br>+ .AgesaFunctionName = AMD_INIT_EARLY,<br>+ .AllocationMethod = PreMemHeap,<br>+ .StdHeader.CalloutPtr = &GetBiosCallout,<br>+ };<br> <br>- memset(&AmdParamStruct, 0, sizeof(AmdParamStruct));<br>-<br>- AmdParamStruct.AgesaFunctionName = AMD_INIT_EARLY;<br>- AmdParamStruct.AllocationMethod = PreMemHeap;<br>- AmdParamStruct.StdHeader.AltImageBasePtr = 0;<br>- AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;<br>- AmdParamStruct.StdHeader.Func = 0;<br>- AmdParamStruct.StdHeader.ImageBasePtr = 0;<br>- AmdCreateStruct (&AmdParamStruct);<br>+ AmdCreateStruct(&AmdParamStruct);<br> <br> AmdEarlyParamsPtr = (AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr;<br>- OemCustomizeInitEarly (AmdEarlyParamsPtr);<br>+ OemCustomizeInitEarly(AmdEarlyParamsPtr);<br> <br> AmdEarlyParamsPtr->GnbConfig.PsppPolicy = PsppDisabled;<br> <br> timestamp_add_now(TS_AGESA_INIT_EARLY_START);<br>- status = AmdInitEarly ((AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr);<br>+ status = AmdInitEarly((AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr);<br> timestamp_add_now(TS_AGESA_INIT_EARLY_DONE);<br> <br> if (status != AGESA_SUCCESS)<br> agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);<br>- AmdReleaseStruct (&AmdParamStruct);<br>+ AmdReleaseStruct(&AmdParamStruct);<br> <br> return status;<br> }<br>@@ -173,21 +163,16 @@<br> AGESA_STATUS agesawrapper_amdinitpost(void)<br> {<br> AGESA_STATUS status;<br>- AMD_INTERFACE_PARAMS AmdParamStruct;<br>- AMD_POST_PARAMS *PostParams;<br>+ AMD_INTERFACE_PARAMS AmdParamStruct = {<br>+ .AgesaFunctionName = AMD_INIT_POST,<br>+ .AllocationMethod = PreMemHeap,<br>+ .StdHeader.CalloutPtr = &GetBiosCallout,<br>+ };<br>+ AMD_POST_PARAMS *PostParams;<br> <br>- memset(&AmdParamStruct, 0, sizeof(AmdParamStruct));<br>+ AmdCreateStruct(&AmdParamStruct);<br> <br>- AmdParamStruct.AgesaFunctionName = AMD_INIT_POST;<br>- AmdParamStruct.AllocationMethod = PreMemHeap;<br>- AmdParamStruct.StdHeader.AltImageBasePtr = 0;<br>- AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;<br>- AmdParamStruct.StdHeader.Func = 0;<br>- AmdParamStruct.StdHeader.ImageBasePtr = 0;<br>-<br>- AmdCreateStruct (&AmdParamStruct);<br> PostParams = (AMD_POST_PARAMS *)AmdParamStruct.NewStructPtr;<br>-<br> PostParams->MemConfig.UmaMode = CONFIG_GFXUMA ? UMA_AUTO : UMA_NONE;<br> PostParams->MemConfig.UmaSize = 0;<br> PostParams->MemConfig.BottomIo = (UINT16)<br>@@ -202,7 +187,7 @@<br> );<br> <br> timestamp_add_now(TS_AGESA_INIT_POST_START);<br>- status = AmdInitPost (PostParams);<br>+ status = AmdInitPost(PostParams);<br> timestamp_add_now(TS_AGESA_INIT_POST_DONE);<br> <br> /*<br>@@ -221,7 +206,7 @@<br> <br> if (status != AGESA_SUCCESS)<br> agesawrapper_readeventlog(PostParams->StdHeader.HeapStatus);<br>- AmdReleaseStruct (&AmdParamStruct);<br>+ AmdReleaseStruct(&AmdParamStruct);<br> <br> return status;<br> }<br>@@ -229,38 +214,37 @@<br> AGESA_STATUS agesawrapper_amdinitenv(void)<br> {<br> AGESA_STATUS status;<br>- AMD_INTERFACE_PARAMS AmdParamStruct;<br>- AMD_ENV_PARAMS *EnvParam;<br>+ AMD_INTERFACE_PARAMS AmdParamStruct = {<br>+ .AgesaFunctionName = AMD_INIT_ENV,<br>+ .AllocationMethod = PostMemDram,<br>+ .StdHeader.CalloutPtr = &GetBiosCallout,<br>+ };<br>+ AMD_ENV_PARAMS *EnvParam;<br> <br>- memset(&AmdParamStruct, 0, sizeof(AmdParamStruct));<br>-<br>- AmdParamStruct.AgesaFunctionName = AMD_INIT_ENV;<br>- AmdParamStruct.AllocationMethod = PostMemDram;<br>- AmdParamStruct.StdHeader.AltImageBasePtr = 0;<br>- AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;<br>- AmdParamStruct.StdHeader.Func = 0;<br>- AmdParamStruct.StdHeader.ImageBasePtr = 0;<br>- status = AmdCreateStruct (&AmdParamStruct);<br>+ status = AmdCreateStruct(&AmdParamStruct);<br> <br> EnvParam = (AMD_ENV_PARAMS *)AmdParamStruct.NewStructPtr;<br> SetFchEnvParams(&EnvParam->FchInterface);<br> SetNbEnvParams(&EnvParam->GnbEnvConfiguration);<br> <br> timestamp_add_now(TS_AGESA_INIT_ENV_START);<br>- status = AmdInitEnv (EnvParam);<br>+ status = AmdInitEnv(EnvParam);<br> timestamp_add_now(TS_AGESA_INIT_ENV_DONE);<br> <br> if (status != AGESA_SUCCESS)<br> agesawrapper_readeventlog(EnvParam->StdHeader.HeapStatus);<br>- /* Initialize Subordinate Bus Number and Secondary Bus Number<br>+ /*<br>+ * FIXME: what is this old comment? D18F0x18 is the Graphics Doorbell<br>+ * Base Address<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>- */<br>+ * Modify D1F0x18<br>+ */<br> <br> return status;<br> }<br> <br>-VOID* agesawrapper_getlateinitptr (int pick)<br>+VOID *agesawrapper_getlateinitptr(int pick)<br> {<br> switch (pick) {<br> case PICK_DMI:<br>@@ -289,34 +273,29 @@<br> AGESA_STATUS agesawrapper_amdinitmid(void)<br> {<br> AGESA_STATUS status;<br>- AMD_INTERFACE_PARAMS AmdParamStruct;<br>+ AMD_INTERFACE_PARAMS AmdParamStruct = {<br>+ .AgesaFunctionName = AMD_INIT_MID,<br>+ .AllocationMethod = PostMemDram,<br>+ .StdHeader.CalloutPtr = &GetBiosCallout,<br>+ };<br> AMD_MID_PARAMS *MidParam;<br> <br> /* Enable MMIO on AMD CPU Address Map Controller */<br>- amd_initcpuio ();<br>+ amd_initcpuio();<br> <br>- memset(&AmdParamStruct, 0, sizeof(AmdParamStruct));<br>-<br>- AmdParamStruct.AgesaFunctionName = AMD_INIT_MID;<br>- AmdParamStruct.AllocationMethod = PostMemDram;<br>- AmdParamStruct.StdHeader.AltImageBasePtr = 0;<br>- AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;<br>- AmdParamStruct.StdHeader.Func = 0;<br>- AmdParamStruct.StdHeader.ImageBasePtr = 0;<br>-<br>- AmdCreateStruct (&AmdParamStruct);<br>+ AmdCreateStruct(&AmdParamStruct);<br> <br> MidParam = (AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr;<br> SetFchMidParams(&MidParam->FchInterface);<br> SetNbMidParams(&MidParam->GnbMidConfiguration);<br> <br> timestamp_add_now(TS_AGESA_INIT_MID_START);<br>- status = AmdInitMid ((AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr);<br>+ status = AmdInitMid((AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr);<br> timestamp_add_now(TS_AGESA_INIT_MID_DONE);<br> <br> if (status != AGESA_SUCCESS)<br> agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);<br>- AmdReleaseStruct (&AmdParamStruct);<br>+ AmdReleaseStruct(&AmdParamStruct);<br> <br> return status;<br> }<br>@@ -324,21 +303,16 @@<br> AGESA_STATUS agesawrapper_amdinitlate(void)<br> {<br> AGESA_STATUS Status;<br>- AMD_INTERFACE_PARAMS AmdParamStruct;<br>+ AMD_INTERFACE_PARAMS AmdParamStruct = {<br>+ .AgesaFunctionName = AMD_INIT_LATE,<br>+ .AllocationMethod = PostMemDram,<br>+ .StdHeader.CalloutPtr = &GetBiosCallout,<br>+ .StdHeader.HeapStatus = HEAP_SYSTEM_MEM,<br>+ };<br> AMD_LATE_PARAMS *AmdLateParams;<br> <br>- memset(&AmdParamStruct, 0, sizeof(AmdParamStruct));<br>-<br>- AmdParamStruct.AgesaFunctionName = AMD_INIT_LATE;<br>- AmdParamStruct.AllocationMethod = PostMemDram;<br>- AmdParamStruct.StdHeader.AltImageBasePtr = 0;<br>- AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;<br>- AmdParamStruct.StdHeader.HeapStatus = HEAP_SYSTEM_MEM;<br>- AmdParamStruct.StdHeader.Func = 0;<br>- AmdParamStruct.StdHeader.ImageBasePtr = 0;<br>-<br>- /* NOTE: if not call amdcreatestruct, the initializer(AmdInitLateInitializer) would not be called */<br> AmdCreateStruct(&AmdParamStruct);<br>+<br> AmdLateParams = (AMD_LATE_PARAMS *)AmdParamStruct.NewStructPtr;<br> <br> timestamp_add_now(TS_AGESA_INIT_LATE_START);<br>@@ -369,11 +343,8 @@<br> return Status;<br> }<br> <br>-AGESA_STATUS agesawrapper_amdlaterunaptask (<br>- UINT32 Func,<br>- UINTN Data,<br>- VOID *ConfigPtr<br>- )<br>+AGESA_STATUS agesawrapper_amdlaterunaptask(UINT32 Func, UINTN Data,<br>+ VOID *ConfigPtr)<br> {<br> AGESA_STATUS Status;<br> AP_EXE_PARAMS ApExeParams;<br>@@ -387,7 +358,7 @@<br> ApExeParams.FunctionNumber = Func;<br> ApExeParams.RelatedDataBlock = ConfigPtr;<br> <br>- Status = AmdLateRunApTask (&ApExeParams);<br>+ Status = AmdLateRunApTask(&ApExeParams);<br> if (Status != AGESA_SUCCESS) {<br> /* agesawrapper_readeventlog(); */<br> ASSERT(Status == AGESA_SUCCESS);<br>@@ -425,10 +396,10 @@<br> region_device_sz(rdev) - metadata_sz);<br> }<br> <br>-const void *agesawrapper_locate_module (const CHAR8 name[8])<br>+const void *agesawrapper_locate_module(const CHAR8 name[8])<br> {<br>- const void* agesa;<br>- const AMD_IMAGE_HEADER* image;<br>+ const void *agesa;<br>+ const AMD_IMAGE_HEADER *image;<br> struct region_device rdev;<br> size_t file_size;<br> const char *fname = CONFIG_AGESA_CBFS_NAME;<br></pre><p>To view, visit <a href="https://review.coreboot.org/22889">change 22889</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/22889"/><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: I40985e0cf50df6aa4d830937e7f6b6e7908f72fe </div>
<div style="display:none"> Gerrit-Change-Number: 22889 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>