<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21708">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/amd: Add required callouts to Stoney BiosCallouts.c<br><br>Hook the new required AGESA callout functions into the callouts tables.<br><br>BUG=b:66690176<br>TEST=Build and boot Kahlee - see the functions get called.<br><br>Change-Id: Ife9c2b20e59ede404edb1f700238e425fea35914<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/mainboard/amd/gardenia/BiosCallOuts.c<br>M src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c<br>M src/mainboard/google/kahlee/BiosCallOuts.c<br>M src/mainboard/google/kahlee/bootblock/BiosCallOuts.c<br>4 files changed, 50 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/21708/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/amd/gardenia/BiosCallOuts.c b/src/mainboard/amd/gardenia/BiosCallOuts.c<br>index 1d06411..c947b0c 100644<br>--- a/src/mainboard/amd/gardenia/BiosCallOuts.c<br>+++ b/src/mainboard/amd/gardenia/BiosCallOuts.c<br>@@ -84,18 +84,35 @@<br> }<br> <br> const BIOS_CALLOUT_STRUCT BiosCallouts[] = {<br>+ /* Required callouts */<br>       {AGESA_ALLOCATE_BUFFER,          agesa_AllocateBuffer },<br>      {AGESA_DEALLOCATE_BUFFER,        agesa_DeallocateBuffer },<br>+   {AGESA_DO_RESET,                 agesa_Reset },<br>       {AGESA_LOCATE_BUFFER,            agesa_LocateBuffer },<br>        {AGESA_READ_SPD,                 agesa_ReadSpd },<br>-    {AGESA_DO_RESET,                 agesa_Reset },<br>-      {AGESA_READ_SPD_RECOVERY,        agesa_NoopUnsupported },<br>     {AGESA_RUNFUNC_ONAP,             agesa_RunFuncOnAp },<br>-        {AGESA_GET_IDS_INIT_DATA,        agesa_EmptyIdsInitData },<br>-   {AGESA_HOOKBEFORE_DQS_TRAINING,  agesa_NoopSuccess },<br>-        {AGESA_HOOKBEFORE_EXIT_SELF_REF, agesa_NoopSuccess },<br>-        {AGESA_FCH_OEM_CALLOUT,          fch_initenv },<br>-      {AGESA_GNB_GFX_GET_VBIOS_IMAGE,  agesa_GfxGetVbiosImage }<br>+    {AGESA_RUNFUNC_ON_ALL_APS,       agesa_RunFcnOnAllAps },<br>+     {AMD_LATE_RUN_AP_TASK,           agesa_LateRunApTask },<br>+      {AGESA_GNB_PCIE_SLOT_RESET,      agesa_PcieSlotResetControl },<br>+       {AGESA_WAIT_FOR_ALL_APS,         agesa_WaitForAllApsFinished },<br>+      {AGESA_IDLE_AN_AP,               agesa_IdleAnAp },<br>+<br>+        /* Optional callouts */<br>+      {AGESA_GET_IDS_INIT_DATA,             agesa_EmptyIdsInitData },<br>+      //AgesaHeapRebase - Hook ID?<br>+ {AGESA_HOOKBEFORE_DRAM_INIT,          agesa_NoopUnsupported },<br>+       {AGESA_HOOKBEFORE_DQS_TRAINING,       agesa_NoopUnsupported },<br>+       {AGESA_EXTERNAL_2D_TRAIN_VREF_CHANGE, agesa_NoopUnsupported },<br>+       {AGESA_HOOKBEFORE_EXIT_SELF_REF,      agesa_NoopUnsupported },<br>+       {AGESA_GNB_GFX_GET_VBIOS_IMAGE,       agesa_GfxGetVbiosImage },<br>+      {AGESA_FCH_OEM_CALLOUT,               fch_initenv },<br>+ {AGESA_EXTERNAL_VOLTAGE_ADJUST,       agesa_NoopUnsupported },<br>+       {AGESA_GNB_PCIE_CLK_REQ,              agesa_NoopUnsupported },<br>+<br>+    /* Deprecated */<br>+     {AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY, agesa_NoopUnsupported},<br>+        {AGESA_READ_SPD_RECOVERY,             agesa_NoopUnsupported },<br>+<br> };<br> <br> const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts);<br>diff --git a/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c b/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c<br>index b0a3e23..1b7a341 100644<br>--- a/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c<br>+++ b/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c<br>@@ -64,6 +64,7 @@<br> <br> const BIOS_CALLOUT_STRUCT BiosCallouts[] = {<br>   {AGESA_FCH_OEM_CALLOUT,          fch_initreset },<br>+    {AGESA_GNB_PCIE_SLOT_RESET,      agesa_PcieSlotResetControl }<br> };<br> <br> const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts);<br>diff --git a/src/mainboard/google/kahlee/BiosCallOuts.c b/src/mainboard/google/kahlee/BiosCallOuts.c<br>index f651876..2e57166 100644<br>--- a/src/mainboard/google/kahlee/BiosCallOuts.c<br>+++ b/src/mainboard/google/kahlee/BiosCallOuts.c<br>@@ -65,18 +65,35 @@<br> }<br> <br> const BIOS_CALLOUT_STRUCT BiosCallouts[] = {<br>+    /* Required callouts */<br>       {AGESA_ALLOCATE_BUFFER,          agesa_AllocateBuffer },<br>      {AGESA_DEALLOCATE_BUFFER,        agesa_DeallocateBuffer },<br>+   {AGESA_DO_RESET,                 agesa_Reset },<br>       {AGESA_LOCATE_BUFFER,            agesa_LocateBuffer },<br>        {AGESA_READ_SPD,                 agesa_ReadSpd },<br>-    {AGESA_DO_RESET,                 agesa_Reset },<br>-      {AGESA_READ_SPD_RECOVERY,        agesa_NoopUnsupported },<br>     {AGESA_RUNFUNC_ONAP,             agesa_RunFuncOnAp },<br>-        {AGESA_GET_IDS_INIT_DATA,        agesa_EmptyIdsInitData },<br>-   {AGESA_HOOKBEFORE_DQS_TRAINING,  agesa_NoopSuccess },<br>-        {AGESA_HOOKBEFORE_EXIT_SELF_REF, agesa_NoopSuccess },<br>-        {AGESA_FCH_OEM_CALLOUT,          fch_initenv },<br>-      {AGESA_GNB_GFX_GET_VBIOS_IMAGE,  agesa_GfxGetVbiosImage }<br>+    {AGESA_RUNFUNC_ON_ALL_APS,       agesa_RunFcnOnAllAps },<br>+     {AMD_LATE_RUN_AP_TASK,           agesa_LateRunApTask },<br>+      {AGESA_GNB_PCIE_SLOT_RESET,      agesa_PcieSlotResetControl },<br>+       {AGESA_WAIT_FOR_ALL_APS,         agesa_WaitForAllApsFinished },<br>+      {AGESA_IDLE_AN_AP,               agesa_IdleAnAp },<br>+<br>+        /* Optional callouts */<br>+      {AGESA_GET_IDS_INIT_DATA,             agesa_EmptyIdsInitData },<br>+      //AgesaHeapRebase - Hook ID?<br>+ {AGESA_HOOKBEFORE_DRAM_INIT,          agesa_NoopUnsupported },<br>+       {AGESA_HOOKBEFORE_DQS_TRAINING,       agesa_NoopUnsupported },<br>+       {AGESA_EXTERNAL_2D_TRAIN_VREF_CHANGE, agesa_NoopUnsupported },<br>+       {AGESA_HOOKBEFORE_EXIT_SELF_REF,      agesa_NoopUnsupported },<br>+       {AGESA_GNB_GFX_GET_VBIOS_IMAGE,       agesa_GfxGetVbiosImage },<br>+      {AGESA_FCH_OEM_CALLOUT,               fch_initenv },<br>+ {AGESA_EXTERNAL_VOLTAGE_ADJUST,       agesa_NoopUnsupported },<br>+       {AGESA_GNB_PCIE_CLK_REQ,              agesa_NoopUnsupported },<br>+<br>+    /* Deprecated */<br>+     {AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY, agesa_NoopUnsupported},<br>+        {AGESA_READ_SPD_RECOVERY,             agesa_NoopUnsupported },<br>+<br> };<br> <br> const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts);<br>diff --git a/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c b/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c<br>index 162fc50..4dce042 100644<br>--- a/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c<br>+++ b/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c<br>@@ -40,6 +40,7 @@<br> <br> const BIOS_CALLOUT_STRUCT BiosCallouts[] = {<br>       {AGESA_FCH_OEM_CALLOUT,          fch_initreset },<br>+    {AGESA_GNB_PCIE_SLOT_RESET,      agesa_PcieSlotResetControl }<br> };<br> <br> const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts);<br></pre><p>To view, visit <a href="https://review.coreboot.org/21708">change 21708</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/21708"/><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: Ife9c2b20e59ede404edb1f700238e425fea35914 </div>
<div style="display:none"> Gerrit-Change-Number: 21708 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>