diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-08-31 22:02:56 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2018-05-06 06:18:11 +0000 |
| commit | 7f937cb172c547287ea9f0bb8d56e897ba93167c (patch) | |
| tree | f6942effee8907a53e1b61821dde903e2ec8c01e | |
| parent | 807e4232f7a1074cf6b80495e365deaecf1db57c (diff) | |
AGESA f14: Remove early HT init
Syncronise HT init code with f12 vendorcode.
Constructor for HT init is not required since init itself
is not called.
Change-Id: I0552c4d019c700f84d98473978afb18fe4eea1e8
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/26040
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | src/vendorcode/amd/agesa/f14/Config/OptionHtInstall.h | 5 | ||||
| -rw-r--r-- | src/vendorcode/amd/agesa/f14/Include/OptionsHt.h | 11 | ||||
| -rw-r--r-- | src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c | 5 |
3 files changed, 18 insertions, 3 deletions
diff --git a/src/vendorcode/amd/agesa/f14/Config/OptionHtInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionHtInstall.h index 5c44465c33..a90867d090 100644 --- a/src/vendorcode/amd/agesa/f14/Config/OptionHtInstall.h +++ b/src/vendorcode/amd/agesa/f14/Config/OptionHtInstall.h @@ -273,7 +273,9 @@ #if (OPTION_FAMILY12H == TRUE) || (OPTION_FAMILY14H == TRUE) #undef OPTION_HT_INIIT_RESET_ENTRY + #undef OPTION_HT_INIIT_RESET_CONSTRUCTOR_ENTRY #define OPTION_HT_INIIT_RESET_ENTRY NULL + #define OPTION_HT_INIIT_RESET_CONSTRUCTOR_ENTRY NULL #endif #if ((OPTION_FAMILY10H == TRUE) || (OPTION_FAMILY15H == TRUE)) @@ -292,7 +294,8 @@ }; CONST OPTION_HT_INIT_RESET ROMDATA HtOptionInitReset = { - OPTION_HT_INIIT_RESET_ENTRY + OPTION_HT_INIIT_RESET_ENTRY, + OPTION_HT_INIIT_RESET_CONSTRUCTOR_ENTRY }; #endif diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionsHt.h b/src/vendorcode/amd/agesa/f14/Include/OptionsHt.h index ae4ede00df..f3eac1a4a6 100644 --- a/src/vendorcode/amd/agesa/f14/Include/OptionsHt.h +++ b/src/vendorcode/amd/agesa/f14/Include/OptionsHt.h @@ -88,11 +88,20 @@ F_OPTION_HT_INIT_RESET ( typedef F_OPTION_HT_INIT_RESET *PF_OPTION_HT_INIT_RESET; +typedef AGESA_STATUS +F_OPTION_HT_RESET_CONSTRUCTOR ( + IN AMD_CONFIG_PARAMS *StdHeader, + IN AMD_HT_RESET_INTERFACE *AmdHtResetInterface + ); + +typedef F_OPTION_HT_RESET_CONSTRUCTOR *PF_OPTION_HT_RESET_CONSTRUCTOR; + /** * Provide HT reset initialization build option results */ typedef struct { - PF_OPTION_HT_INIT_RESET HtInitReset; ///< Method: HT reset initialization. + PF_OPTION_HT_INIT_RESET HtInitReset; ///< Method: HT reset initialization. + PF_OPTION_HT_RESET_CONSTRUCTOR HtResetConstructor; ///< Method: HT reset initialization. } OPTION_HT_INIT_RESET; /*---------------------------------------------------------------------------------------- diff --git a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c index 7b75aad08e..6a465ee858 100644 --- a/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c +++ b/src/vendorcode/amd/agesa/f14/Proc/Common/AmdInitReset.c @@ -249,7 +249,10 @@ AmdInitResetConstructor ( AmdResetParams->StdHeader = *StdHeader; AmdInitResetExecutionCacheAllocateInitializer (&AmdResetParams->StdHeader, &AmdResetParams->CacheRegion[0]); - AmdHtResetConstructor (&AmdResetParams->StdHeader, &AmdResetParams->HtConfig); + // Initialize Hyper Transport input structure + if (HtOptionInitReset.HtResetConstructor != NULL) { + HtOptionInitReset.HtResetConstructor (&AmdResetParams->StdHeader, &AmdResetParams->HtConfig); + } return AGESA_SUCCESS; } |