mainboard/amd: Add required callouts to Stoney BiosCallouts.c

Hook the new required AGESA callout functions into the callouts tables.

BUG=b:66690176
TEST=Build and boot Kahlee - see the functions get called.

Change-Id: Ife9c2b20e59ede404edb1f700238e425fea35914
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/21708
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Martin Roth 2017-09-26 14:48:17 -06:00
parent f80a431c11
commit 7c48b891fe
4 changed files with 50 additions and 14 deletions

View File

@ -84,18 +84,35 @@ static AGESA_STATUS fch_initenv(UINT32 Func, UINTN FchData, VOID *ConfigPtr)
} }
const BIOS_CALLOUT_STRUCT BiosCallouts[] = { const BIOS_CALLOUT_STRUCT BiosCallouts[] = {
/* Required callouts */
{AGESA_ALLOCATE_BUFFER, agesa_AllocateBuffer }, {AGESA_ALLOCATE_BUFFER, agesa_AllocateBuffer },
{AGESA_DEALLOCATE_BUFFER, agesa_DeallocateBuffer }, {AGESA_DEALLOCATE_BUFFER, agesa_DeallocateBuffer },
{AGESA_DO_RESET, agesa_Reset },
{AGESA_LOCATE_BUFFER, agesa_LocateBuffer }, {AGESA_LOCATE_BUFFER, agesa_LocateBuffer },
{AGESA_READ_SPD, agesa_ReadSpd }, {AGESA_READ_SPD, agesa_ReadSpd },
{AGESA_DO_RESET, agesa_Reset },
{AGESA_READ_SPD_RECOVERY, agesa_NoopUnsupported },
{AGESA_RUNFUNC_ONAP, agesa_RunFuncOnAp }, {AGESA_RUNFUNC_ONAP, agesa_RunFuncOnAp },
{AGESA_GET_IDS_INIT_DATA, agesa_EmptyIdsInitData }, {AGESA_RUNFUNC_ON_ALL_APS, agesa_RunFcnOnAllAps },
{AGESA_HOOKBEFORE_DQS_TRAINING, agesa_NoopSuccess }, {AMD_LATE_RUN_AP_TASK, agesa_LateRunApTask },
{AGESA_HOOKBEFORE_EXIT_SELF_REF, agesa_NoopSuccess }, {AGESA_GNB_PCIE_SLOT_RESET, agesa_PcieSlotResetControl },
{AGESA_FCH_OEM_CALLOUT, fch_initenv }, {AGESA_WAIT_FOR_ALL_APS, agesa_WaitForAllApsFinished },
{AGESA_GNB_GFX_GET_VBIOS_IMAGE, agesa_GfxGetVbiosImage } {AGESA_IDLE_AN_AP, agesa_IdleAnAp },
/* Optional callouts */
{AGESA_GET_IDS_INIT_DATA, agesa_EmptyIdsInitData },
//AgesaHeapRebase - Hook ID?
{AGESA_HOOKBEFORE_DRAM_INIT, agesa_NoopUnsupported },
{AGESA_HOOKBEFORE_DQS_TRAINING, agesa_NoopUnsupported },
{AGESA_EXTERNAL_2D_TRAIN_VREF_CHANGE, agesa_NoopUnsupported },
{AGESA_HOOKBEFORE_EXIT_SELF_REF, agesa_NoopUnsupported },
{AGESA_GNB_GFX_GET_VBIOS_IMAGE, agesa_GfxGetVbiosImage },
{AGESA_FCH_OEM_CALLOUT, fch_initenv },
{AGESA_EXTERNAL_VOLTAGE_ADJUST, agesa_NoopUnsupported },
{AGESA_GNB_PCIE_CLK_REQ, agesa_NoopUnsupported },
/* Deprecated */
{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY, agesa_NoopUnsupported},
{AGESA_READ_SPD_RECOVERY, agesa_NoopUnsupported },
}; };
const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts); const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts);

View File

@ -64,6 +64,7 @@ static AGESA_STATUS fch_initreset(UINT32 Func, UINTN FchData, VOID *ConfigPtr)
const BIOS_CALLOUT_STRUCT BiosCallouts[] = { const BIOS_CALLOUT_STRUCT BiosCallouts[] = {
{AGESA_FCH_OEM_CALLOUT, fch_initreset }, {AGESA_FCH_OEM_CALLOUT, fch_initreset },
{AGESA_GNB_PCIE_SLOT_RESET, agesa_PcieSlotResetControl }
}; };
const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts); const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts);

View File

@ -65,18 +65,35 @@ static AGESA_STATUS fch_initenv(UINT32 Func, UINTN FchData, VOID *ConfigPtr)
} }
const BIOS_CALLOUT_STRUCT BiosCallouts[] = { const BIOS_CALLOUT_STRUCT BiosCallouts[] = {
/* Required callouts */
{AGESA_ALLOCATE_BUFFER, agesa_AllocateBuffer }, {AGESA_ALLOCATE_BUFFER, agesa_AllocateBuffer },
{AGESA_DEALLOCATE_BUFFER, agesa_DeallocateBuffer }, {AGESA_DEALLOCATE_BUFFER, agesa_DeallocateBuffer },
{AGESA_DO_RESET, agesa_Reset },
{AGESA_LOCATE_BUFFER, agesa_LocateBuffer }, {AGESA_LOCATE_BUFFER, agesa_LocateBuffer },
{AGESA_READ_SPD, agesa_ReadSpd }, {AGESA_READ_SPD, agesa_ReadSpd },
{AGESA_DO_RESET, agesa_Reset },
{AGESA_READ_SPD_RECOVERY, agesa_NoopUnsupported },
{AGESA_RUNFUNC_ONAP, agesa_RunFuncOnAp }, {AGESA_RUNFUNC_ONAP, agesa_RunFuncOnAp },
{AGESA_GET_IDS_INIT_DATA, agesa_EmptyIdsInitData }, {AGESA_RUNFUNC_ON_ALL_APS, agesa_RunFcnOnAllAps },
{AGESA_HOOKBEFORE_DQS_TRAINING, agesa_NoopSuccess }, {AMD_LATE_RUN_AP_TASK, agesa_LateRunApTask },
{AGESA_HOOKBEFORE_EXIT_SELF_REF, agesa_NoopSuccess }, {AGESA_GNB_PCIE_SLOT_RESET, agesa_PcieSlotResetControl },
{AGESA_FCH_OEM_CALLOUT, fch_initenv }, {AGESA_WAIT_FOR_ALL_APS, agesa_WaitForAllApsFinished },
{AGESA_GNB_GFX_GET_VBIOS_IMAGE, agesa_GfxGetVbiosImage } {AGESA_IDLE_AN_AP, agesa_IdleAnAp },
/* Optional callouts */
{AGESA_GET_IDS_INIT_DATA, agesa_EmptyIdsInitData },
//AgesaHeapRebase - Hook ID?
{AGESA_HOOKBEFORE_DRAM_INIT, agesa_NoopUnsupported },
{AGESA_HOOKBEFORE_DQS_TRAINING, agesa_NoopUnsupported },
{AGESA_EXTERNAL_2D_TRAIN_VREF_CHANGE, agesa_NoopUnsupported },
{AGESA_HOOKBEFORE_EXIT_SELF_REF, agesa_NoopUnsupported },
{AGESA_GNB_GFX_GET_VBIOS_IMAGE, agesa_GfxGetVbiosImage },
{AGESA_FCH_OEM_CALLOUT, fch_initenv },
{AGESA_EXTERNAL_VOLTAGE_ADJUST, agesa_NoopUnsupported },
{AGESA_GNB_PCIE_CLK_REQ, agesa_NoopUnsupported },
/* Deprecated */
{AGESA_HOOKBEFORE_DRAM_INIT_RECOVERY, agesa_NoopUnsupported},
{AGESA_READ_SPD_RECOVERY, agesa_NoopUnsupported },
}; };
const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts); const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts);

View File

@ -40,6 +40,7 @@ static AGESA_STATUS fch_initreset(UINT32 Func, UINTN FchData, VOID *ConfigPtr)
const BIOS_CALLOUT_STRUCT BiosCallouts[] = { const BIOS_CALLOUT_STRUCT BiosCallouts[] = {
{AGESA_FCH_OEM_CALLOUT, fch_initreset }, {AGESA_FCH_OEM_CALLOUT, fch_initreset },
{AGESA_GNB_PCIE_SLOT_RESET, agesa_PcieSlotResetControl }
}; };
const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts); const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts);