AGESA: Move agesawrapper_laterunaptask()

Change-Id: I916d808d1b2ecc4b70b5dfebff62c4a18119f157
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/20816
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Kyösti Mälkki 2017-07-28 04:48:35 +03:00
parent 0a7cab8de8
commit c7dcec6a1b
5 changed files with 17 additions and 57 deletions

View File

@ -303,24 +303,3 @@ AGESA_STATUS agesawrapper_amdinitlate(void)
} }
#endif /* __PRE_RAM__ */ #endif /* __PRE_RAM__ */
AGESA_STATUS agesawrapper_amdlaterunaptask(UINT32 Func, UINTN Data, VOID * ConfigPtr)
{
AGESA_STATUS status;
AP_EXE_PARAMS ApExeParams;
memset(&ApExeParams, 0, sizeof(AP_EXE_PARAMS));
ApExeParams.StdHeader.AltImageBasePtr = 0;
ApExeParams.StdHeader.CalloutPtr = &GetBiosCallout;
ApExeParams.StdHeader.Func = 0;
ApExeParams.StdHeader.ImageBasePtr = 0;
ApExeParams.FunctionNumber = Func;
ApExeParams.RelatedDataBlock = ConfigPtr;
status = AmdLateRunApTask(&ApExeParams);
AGESA_EVENTLOG(status, &ApExeParams.StdHeader);
ASSERT(status == AGESA_SUCCESS);
return status;
}

View File

@ -30,7 +30,6 @@ AGESA_STATUS agesawrapper_amdinitmid(void);
AGESA_STATUS agesawrapper_amdinitresume(void); AGESA_STATUS agesawrapper_amdinitresume(void);
AGESA_STATUS agesawrapper_amdS3Save(void); AGESA_STATUS agesawrapper_amdS3Save(void);
AGESA_STATUS agesawrapper_amds3laterestore(void); AGESA_STATUS agesawrapper_amds3laterestore(void);
AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINTN Data, VOID *ConfigPtr);
AGESA_STATUS agesawrapper_fchs3earlyrestore(void); AGESA_STATUS agesawrapper_fchs3earlyrestore(void);
AGESA_STATUS agesawrapper_fchs3laterestore(void); AGESA_STATUS agesawrapper_fchs3laterestore(void);

View File

@ -16,11 +16,12 @@
#include <cbfs.h> #include <cbfs.h>
#include <spd_bin.h> #include <spd_bin.h>
#include <string.h>
#include "AGESA.h" #include "AGESA.h"
#include "amdlib.h" #include "amdlib.h"
#include "Ids.h" #include "Ids.h"
#include <northbridge/amd/agesa/agesawrapper.h> #include <northbridge/amd/agesa/state_machine.h>
#include "BiosCallOuts.h" #include "BiosCallOuts.h"
#include "dimmSpd.h" #include "dimmSpd.h"
@ -107,10 +108,22 @@ AGESA_STATUS agesa_Reset (UINT32 Func, UINTN Data, VOID *ConfigPtr)
AGESA_STATUS agesa_RunFuncOnAp (UINT32 Func, UINTN Data, VOID *ConfigPtr) AGESA_STATUS agesa_RunFuncOnAp (UINT32 Func, UINTN Data, VOID *ConfigPtr)
{ {
AGESA_STATUS Status; AGESA_STATUS status;
AP_EXE_PARAMS ApExeParams;
Status = agesawrapper_amdlaterunaptask (Func, Data, ConfigPtr); memset(&ApExeParams, 0, sizeof(AP_EXE_PARAMS));
return Status;
ApExeParams.StdHeader.AltImageBasePtr = 0;
ApExeParams.StdHeader.CalloutPtr = &GetBiosCallout;
ApExeParams.StdHeader.Func = 0;
ApExeParams.StdHeader.ImageBasePtr = 0;
ApExeParams.FunctionNumber = Func;
ApExeParams.RelatedDataBlock = ConfigPtr;
status = AmdLateRunApTask(&ApExeParams);
ASSERT(status == AGESA_SUCCESS);
return status;
} }
#if defined(AGESA_GNB_GFX_GET_VBIOS_IMAGE) #if defined(AGESA_GNB_GFX_GET_VBIOS_IMAGE)

View File

@ -286,36 +286,6 @@ AGESA_STATUS agesawrapper_amdinitlate(void)
} }
#endif /* #ifndef __PRE_RAM__ */ #endif /* #ifndef __PRE_RAM__ */
AGESA_STATUS agesawrapper_amdlaterunaptask (
UINT32 Func,
UINTN Data,
VOID *ConfigPtr
)
{
AGESA_STATUS Status;
AP_EXE_PARAMS ApExeParams;
LibAmdMemFill (&ApExeParams,
0,
sizeof(AP_EXE_PARAMS),
&(ApExeParams.StdHeader));
ApExeParams.StdHeader.AltImageBasePtr = 0;
ApExeParams.StdHeader.CalloutPtr = &GetBiosCallout;
ApExeParams.StdHeader.Func = 0;
ApExeParams.StdHeader.ImageBasePtr = 0;
ApExeParams.FunctionNumber = Func;
ApExeParams.RelatedDataBlock = ConfigPtr;
Status = AmdLateRunApTask (&ApExeParams);
if (Status != AGESA_SUCCESS) {
/* agesawrapper_amdreadeventlog(); */
ASSERT(Status == AGESA_SUCCESS);
}
return Status;
}
const void *agesawrapper_locate_module (const CHAR8 name[8]) const void *agesawrapper_locate_module (const CHAR8 name[8])
{ {
const void* agesa; const void* agesa;

View File

@ -40,7 +40,6 @@ AGESA_STATUS agesawrapper_amdinitpost(void);
AGESA_STATUS agesawrapper_amdinitmid(void); AGESA_STATUS agesawrapper_amdinitmid(void);
void agesawrapper_setlateinitptr (void *Late); void agesawrapper_setlateinitptr (void *Late);
void *agesawrapper_getlateinitptr(int pick); void *agesawrapper_getlateinitptr(int pick);
AGESA_STATUS agesawrapper_amdlaterunaptask(UINT32 Func, UINTN Data, void *ConfigPtr);
AGESA_STATUS agesawrapper_amdS3Save(void); AGESA_STATUS agesawrapper_amdS3Save(void);
AGESA_STATUS agesawrapper_amdinitresume(void); AGESA_STATUS agesawrapper_amdinitresume(void);
AGESA_STATUS agesawrapper_amds3laterestore(void); AGESA_STATUS agesawrapper_amds3laterestore(void);