<p>Marshall Dawson has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23440">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/common: Add generic create_struct call to wrapper<br><br>Create a generic function that reports an unsuccessful call to<br>AmdCreateStruct().<br><br>Change-Id: I2654b4f21de5a2621086142681181a687be2c8e3<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/soc/amd/common/block/pi/agesawrapper.c<br>1 file changed, 18 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/23440/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c</span><br><span>index 6b27111..cd71998 100644</span><br><span>--- a/src/soc/amd/common/block/pi/agesawrapper.c</span><br><span>+++ b/src/soc/amd/common/block/pi/agesawrapper.c</span><br><span>@@ -69,6 +69,18 @@</span><br><span> return Status;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static AGESA_STATUS create_struct(AMD_INTERFACE_PARAMS *interface_struct)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ AGESA_STATUS status = AmdCreateStruct(interface_struct);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (status == AGESA_SUCCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ return status;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_ERR, "Error: AmdCreateStruct() for 0x%x returned 0x%x. "</span><br><span style="color: hsl(120, 100%, 40%);">+ "Proper system initialization may not be possible.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ interface_struct->AgesaFunctionName, status);</span><br><span style="color: hsl(120, 100%, 40%);">+ return status;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> AGESA_STATUS agesawrapper_amdinitreset(void)</span><br><span> {</span><br><span> AGESA_STATUS status;</span><br><span>@@ -80,7 +92,7 @@</span><br><span> .NewStructPtr = &AmdResetParams,</span><br><span> .StdHeader.CalloutPtr = &GetBiosCallout</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- AmdCreateStruct(&AmdParamStruct);</span><br><span style="color: hsl(120, 100%, 40%);">+ create_struct(&AmdParamStruct);</span><br><span> SetFchResetParams(&AmdResetParams.FchInterface);</span><br><span> </span><br><span> timestamp_add_now(TS_AGESA_INIT_RESET_START);</span><br><span>@@ -103,7 +115,7 @@</span><br><span> .StdHeader.CalloutPtr = &GetBiosCallout,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- AmdCreateStruct(&AmdParamStruct);</span><br><span style="color: hsl(120, 100%, 40%);">+ create_struct(&AmdParamStruct);</span><br><span> </span><br><span> AmdEarlyParamsPtr = (AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr;</span><br><span> OemCustomizeInitEarly(AmdEarlyParamsPtr);</span><br><span>@@ -164,7 +176,7 @@</span><br><span> };</span><br><span> AMD_POST_PARAMS *PostParams;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- AmdCreateStruct(&AmdParamStruct);</span><br><span style="color: hsl(120, 100%, 40%);">+ create_struct(&AmdParamStruct);</span><br><span> </span><br><span> PostParams = (AMD_POST_PARAMS *)AmdParamStruct.NewStructPtr;</span><br><span> PostParams->MemConfig.UmaMode = CONFIG_GFXUMA ? UMA_AUTO : UMA_NONE;</span><br><span>@@ -215,7 +227,7 @@</span><br><span> };</span><br><span> AMD_ENV_PARAMS *EnvParam;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- status = AmdCreateStruct(&AmdParamStruct);</span><br><span style="color: hsl(120, 100%, 40%);">+ status = create_struct(&AmdParamStruct);</span><br><span> </span><br><span> EnvParam = (AMD_ENV_PARAMS *)AmdParamStruct.NewStructPtr;</span><br><span> SetFchEnvParams(&EnvParam->FchInterface);</span><br><span>@@ -270,7 +282,7 @@</span><br><span> /* Enable MMIO on AMD CPU Address Map Controller */</span><br><span> amd_initcpuio();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- AmdCreateStruct(&AmdParamStruct);</span><br><span style="color: hsl(120, 100%, 40%);">+ create_struct(&AmdParamStruct);</span><br><span> </span><br><span> MidParam = (AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr;</span><br><span> SetFchMidParams(&MidParam->FchInterface);</span><br><span>@@ -302,7 +314,7 @@</span><br><span> * NOTE: if not call amdcreatestruct, the initializer</span><br><span> * (AmdInitLateInitializer) would not be called.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- AmdCreateStruct(&AmdParamStruct);</span><br><span style="color: hsl(120, 100%, 40%);">+ create_struct(&AmdParamStruct);</span><br><span> AmdLateParams = (AMD_LATE_PARAMS *)AmdParamStruct.NewStructPtr;</span><br><span> </span><br><span> timestamp_add_now(TS_AGESA_INIT_LATE_START);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23440">change 23440</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/23440"/><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: I2654b4f21de5a2621086142681181a687be2c8e3 </div>
<div style="display:none"> Gerrit-Change-Number: 23440 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>