GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/common: Remove AmdReadEventLog() 

Parameter passing is incorrect here, it should pass
complete StdHeader instead of attempting to fill
in HeapStatus that should be treated as a field private
to AGESA, based on where it is defined in the header
files.

Furthermore the while() loop did not evaluate the
return value. Feature can be brought back at a later
date after someone verifies it actually works correctly
across different stages.

Change-Id: Ib243b275f8700ecaeb330772c795d305c61899c5
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31484
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2018-06-28 22:12:20 +03:00 committed by Patrick Georgi
parent 6e512c4d7a
commit 63bc18e328
2 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/soc/amd/common/block/pi/agesawrapper.c
View File

@ -41,34 +41,6 @@ static void *AcpiAlib;
static void *AcpiIvrs; static void *AcpiIvrs;
static void *AcpiCrat; static void *AcpiCrat;
static AGESA_STATUS agesawrapper_readeventlog(uint8_t HeapStatus)
{
AGESA_STATUS Status;
EVENT_PARAMS AmdEventParams = {
.StdHeader.CalloutPtr = &GetBiosCallout,
.StdHeader.HeapStatus = HeapStatus,
};
Status = AmdReadEventLog(&AmdEventParams);
if (AmdEventParams.EventClass)
printk(BIOS_DEBUG, "AGESA Event Log:\n");
while (AmdEventParams.EventClass != 0) {
printk(BIOS_DEBUG, " Class = %x, Info = %x,"
" Param1 = 0x%x, Param2 = 0x%x"
" Param3 = 0x%x, Param4 = 0x%x\n",
(u32)AmdEventParams.EventClass,
(u32)AmdEventParams.EventInfo,
(u32)AmdEventParams.DataParam1,
(u32)AmdEventParams.DataParam2,
(u32)AmdEventParams.DataParam3,
(u32)AmdEventParams.DataParam4);
Status = AmdReadEventLog(&AmdEventParams);
}
return Status;
}
static void *create_struct(AMD_INTERFACE_PARAMS *interface_struct) static void *create_struct(AMD_INTERFACE_PARAMS *interface_struct)
{ {
/* Should clone entire StdHeader here. */ /* Should clone entire StdHeader here. */
@ -107,8 +79,6 @@ static AGESA_STATUS amd_init_reset(void)
status = AmdInitReset(ResetParams); status = AmdInitReset(ResetParams);
timestamp_add_now(TS_AGESA_INIT_RESET_DONE); timestamp_add_now(TS_AGESA_INIT_RESET_DONE);
if (status != AGESA_SUCCESS)
agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);
AmdReleaseStruct(&AmdParamStruct); AmdReleaseStruct(&AmdParamStruct);
return status; return status;
} }
@ -130,8 +100,6 @@ static AGESA_STATUS amd_init_early(void)
status = AmdInitEarly(EarlyParams); status = AmdInitEarly(EarlyParams);
timestamp_add_now(TS_AGESA_INIT_EARLY_DONE); timestamp_add_now(TS_AGESA_INIT_EARLY_DONE);
if (status != AGESA_SUCCESS)
agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);
AmdReleaseStruct(&AmdParamStruct); AmdReleaseStruct(&AmdParamStruct);
return status; return status;
@ -218,8 +186,6 @@ static AGESA_STATUS amd_init_post(void)
print_init_post_settings(PostParams); print_init_post_settings(PostParams);
if (status != AGESA_SUCCESS)
agesawrapper_readeventlog(PostParams->StdHeader.HeapStatus);
AmdReleaseStruct(&AmdParamStruct); AmdReleaseStruct(&AmdParamStruct);
return status; return status;
@ -242,8 +208,6 @@ static AGESA_STATUS amd_init_env(void)
status = AmdInitEnv(EnvParams); status = AmdInitEnv(EnvParams);
timestamp_add_now(TS_AGESA_INIT_ENV_DONE); timestamp_add_now(TS_AGESA_INIT_ENV_DONE);
if (status != AGESA_SUCCESS)
agesawrapper_readeventlog(EnvParams->StdHeader.HeapStatus);
AmdReleaseStruct(&AmdParamStruct); AmdReleaseStruct(&AmdParamStruct);
return status; return status;
@ -295,8 +259,6 @@ static AGESA_STATUS amd_init_mid(void)
status = AmdInitMid(MidParams); status = AmdInitMid(MidParams);
timestamp_add_now(TS_AGESA_INIT_MID_DONE); timestamp_add_now(TS_AGESA_INIT_MID_DONE);
if (status != AGESA_SUCCESS)
agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);
AmdReleaseStruct(&AmdParamStruct); AmdReleaseStruct(&AmdParamStruct);
return status; return status;
@ -327,11 +289,6 @@ static AGESA_STATUS amd_init_late(void)
Status = AmdInitLate(LateParams); Status = AmdInitLate(LateParams);
timestamp_add_now(TS_AGESA_INIT_LATE_DONE); timestamp_add_now(TS_AGESA_INIT_LATE_DONE);
if (Status != AGESA_SUCCESS) {
agesawrapper_readeventlog(LateParams->StdHeader.HeapStatus);
ASSERT(Status == AGESA_SUCCESS);
}
DmiTable = LateParams->DmiTable; DmiTable = LateParams->DmiTable;
AcpiPstate = LateParams->AcpiPState; AcpiPstate = LateParams->AcpiPState;
@ -371,11 +328,6 @@ static AGESA_STATUS amd_init_rtb(void)
Status = AmdInitRtb(RtbParams); Status = AmdInitRtb(RtbParams);
timestamp_add_now(TS_AGESA_INIT_RTB_DONE); timestamp_add_now(TS_AGESA_INIT_RTB_DONE);
if (Status != AGESA_SUCCESS) {
agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);
ASSERT(Status == AGESA_SUCCESS);
}
if (save_s3_info(RtbParams->S3DataBlock.NvStorage, if (save_s3_info(RtbParams->S3DataBlock.NvStorage,
RtbParams->S3DataBlock.NvStorageSize, RtbParams->S3DataBlock.NvStorageSize,
RtbParams->S3DataBlock.VolatileStorage, RtbParams->S3DataBlock.VolatileStorage,
@ -405,8 +357,6 @@ static AGESA_STATUS amd_init_resume(void)
status = AmdInitResume(InitResumeParams); status = AmdInitResume(InitResumeParams);
timestamp_add_now(TS_AGESA_INIT_RESUME_DONE); timestamp_add_now(TS_AGESA_INIT_RESUME_DONE);
if (status != AGESA_SUCCESS)
agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);
AmdReleaseStruct(&AmdParamStruct); AmdReleaseStruct(&AmdParamStruct);
return status; return status;
@ -435,10 +385,6 @@ static AGESA_STATUS amd_s3late_restore(void)
Status = AmdS3LateRestore(S3LateParams); Status = AmdS3LateRestore(S3LateParams);
timestamp_add_now(TS_AGESA_S3_LATE_DONE); timestamp_add_now(TS_AGESA_S3_LATE_DONE);
if (Status != AGESA_SUCCESS) {
agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);
ASSERT(Status == AGESA_SUCCESS);
}
AmdReleaseStruct(&AmdParamStruct); AmdReleaseStruct(&AmdParamStruct);
return Status; return Status;
@ -465,10 +411,6 @@ static AGESA_STATUS amd_s3final_restore(void)
Status = AmdS3FinalRestore(S3FinalParams); Status = AmdS3FinalRestore(S3FinalParams);
timestamp_add_now(TS_AGESA_S3_FINAL_DONE); timestamp_add_now(TS_AGESA_S3_FINAL_DONE);
if (Status != AGESA_SUCCESS) {
agesawrapper_readeventlog(AmdParamStruct.StdHeader.HeapStatus);
ASSERT(Status == AGESA_SUCCESS);
}
AmdReleaseStruct(&AmdParamStruct); AmdReleaseStruct(&AmdParamStruct);
return Status; return Status;

14
src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c
View File

@ -226,17 +226,3 @@ AmdLateRunApTask (
if (!Dispatcher) return AGESA_UNSUPPORTED; if (!Dispatcher) return AGESA_UNSUPPORTED;
return Dispatcher(AmdApExeParams); return Dispatcher(AmdApExeParams);
} }
/**********************************************************************
* Interface service call: AmdReadEventLog
**********************************************************************/
AGESA_STATUS
AmdReadEventLog (
IN EVENT_PARAMS *Event
)
{
MODULE_ENTRY Dispatcher = agesa_get_dispatcher();
Event->StdHeader.Func = AMD_READ_EVENT_LOG;
if (!Dispatcher) return AGESA_UNSUPPORTED;
return Dispatcher(Event);
}