From 27c4edace6ff3246c6b0345300931850d9e7f4bc Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Tue, 21 Oct 2014 14:19:04 +0300 Subject: AGESA: Report events with AGESA_EVENTLOG() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NOTE: For fam12 and fam14 ASSERT() is defined empty so execution may fall through critical failures. Change-Id: Ifef65d749d340f1df3a43b5fcb38c4315ef944e8 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/7154 Reviewed-by: Edward O'Callaghan Tested-by: build bot (Jenkins) --- src/mainboard/gizmosphere/gizmo/agesawrapper.c | 36 ++++++++++---------------- 1 file changed, 14 insertions(+), 22 deletions(-) (limited to 'src/mainboard/gizmosphere/gizmo') diff --git a/src/mainboard/gizmosphere/gizmo/agesawrapper.c b/src/mainboard/gizmosphere/gizmo/agesawrapper.c index 129c162c4f..1ec878260b 100644 --- a/src/mainboard/gizmosphere/gizmo/agesawrapper.c +++ b/src/mainboard/gizmosphere/gizmo/agesawrapper.c @@ -186,7 +186,7 @@ AGESA_STATUS agesawrapper_amdinitreset ( AmdResetParams.HtConfig.Depth = 0; status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); - if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); + AGESA_EVENTLOG(status); AmdReleaseStruct (&AmdParamStruct); return status; } @@ -213,7 +213,7 @@ AGESA_STATUS agesawrapper_amdinitearly ( OemCustomizeInitEarly (AmdEarlyParamsPtr); status = AmdInitEarly ((AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr); - if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); + AGESA_EVENTLOG(status); AmdReleaseStruct (&AmdParamStruct); return status; @@ -237,7 +237,7 @@ AGESA_STATUS agesawrapper_amdinitpost ( AmdCreateStruct (&AmdParamStruct); status = AmdInitPost ((AMD_POST_PARAMS *)AmdParamStruct.NewStructPtr); - if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); + AGESA_EVENTLOG(status); AmdReleaseStruct (&AmdParamStruct); /* Initialize heap space */ @@ -265,7 +265,7 @@ AGESA_STATUS agesawrapper_amdinitenv ( AmdParamStruct.StdHeader.ImageBasePtr = 0; AmdCreateStruct (&AmdParamStruct); status = AmdInitEnv ((AMD_ENV_PARAMS *)AmdParamStruct.NewStructPtr); - if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); + AGESA_EVENTLOG(status); /* Initialize Subordinate Bus Number and Secondary Bus Number * In platform BIOS this address is allocated by PCI enumeration code Modify D1F0x18 @@ -390,7 +390,7 @@ AGESA_STATUS agesawrapper_amdinitmid ( AmdCreateStruct (&AmdParamStruct); status = AmdInitMid ((AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr); - if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); + AGESA_EVENTLOG(status); AmdReleaseStruct (&AmdParamStruct); return status; @@ -419,10 +419,8 @@ AGESA_STATUS agesawrapper_amdinitlate ( printk (BIOS_DEBUG, "agesawrapper_amdinitlate: AmdLateParamsPtr = %X\n", (u32)AmdLateParamsPtr); Status = AmdInitLate (AmdLateParamsPtr); - if (Status != AGESA_SUCCESS) { - agesawrapper_amdreadeventlog(); - ASSERT(Status == AGESA_SUCCESS); - } + AGESA_EVENTLOG(Status); + ASSERT(Status == AGESA_SUCCESS); DmiTable = AmdLateParamsPtr->DmiTable; AcpiPstate = AmdLateParamsPtr->AcpiPState; @@ -476,7 +474,7 @@ AGESA_STATUS agesawrapper_amdinitresume ( status = AmdInitResume ((AMD_RESUME_PARAMS *)AmdParamStruct.NewStructPtr); - if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); + AGESA_EVENTLOG(status); AmdReleaseStruct (&AmdParamStruct); return status; @@ -512,10 +510,8 @@ AGESA_STATUS agesawrapper_amds3laterestore ( (void **) &AmdS3LateParamsPtr->S3DataBlock.VolatileStorage); Status = AmdS3LateRestore (AmdS3LateParamsPtr); - if (Status != AGESA_SUCCESS) { - agesawrapper_amdreadeventlog(); - ASSERT(Status == AGESA_SUCCESS); - } + AGESA_EVENTLOG(Status); + ASSERT(Status == AGESA_SUCCESS); return Status; } @@ -545,10 +541,8 @@ AGESA_STATUS agesawrapper_amdS3Save ( AmdS3SaveParamsPtr->StdHeader = AmdInterfaceParams.StdHeader; Status = AmdS3Save (AmdS3SaveParamsPtr); - if (Status != AGESA_SUCCESS) { - agesawrapper_amdreadeventlog(); - ASSERT(Status == AGESA_SUCCESS); - } + AGESA_EVENTLOG(Status); + ASSERT(Status == AGESA_SUCCESS); S3DataType = S3DataTypeNonVolatile; @@ -593,10 +587,8 @@ AGESA_STATUS agesawrapper_amdlaterunaptask ( ApExeParams.RelatedDataBlock = ConfigPtr; Status = AmdLateRunApTask (&ApExeParams); - if (Status != AGESA_SUCCESS) { - agesawrapper_amdreadeventlog(); - ASSERT(Status == AGESA_SUCCESS); - } + AGESA_EVENTLOG(Status); + ASSERT(Status == AGESA_SUCCESS); return Status; } -- cgit v1.2.3