Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/22902
Change subject: soc/amd/common: Make AGESA event log parser static ......................................................................
soc/amd/common: Make AGESA event log parser static
The function agesawrapper_readeventlog() is not used outside of the wrapper. Relocate it within the file and make it static.
Change-Id: Ia7fefb4eadbace0cc2fb0f519a1acb7906baaf12 Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com --- M src/soc/amd/common/block/include/amdblocks/agesawrapper.h M src/soc/amd/common/block/pi/agesawrapper.c 2 files changed, 28 insertions(+), 29 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/22902/1
diff --git a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h index 1b4cde8..d16e9ff 100644 --- a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h +++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h @@ -40,7 +40,6 @@ AGESA_STATUS agesawrapper_amdinitlate(void); AGESA_STATUS agesawrapper_amdinitpost(void); AGESA_STATUS agesawrapper_amdinitmid(void); -AGESA_STATUS agesawrapper_readeventlog(UINT8 HeapStatus); void *agesawrapper_getlateinitptr(int pick); AGESA_STATUS agesawrapper_amdlaterunaptask(UINT32 Func, UINTN Data, void *ConfigPtr); diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c index 5c85430..b9931d2 100644 --- a/src/soc/amd/common/block/pi/agesawrapper.c +++ b/src/soc/amd/common/block/pi/agesawrapper.c @@ -40,6 +40,34 @@ static void *AcpiCrat; #endif /* #ifndef __PRE_RAM__ */
+static AGESA_STATUS agesawrapper_readeventlog(UINT8 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; +} + AGESA_STATUS agesawrapper_amdinitreset(void) { AGESA_STATUS status; @@ -358,34 +386,6 @@ if (Status != AGESA_SUCCESS) { /* agesawrapper_readeventlog(); */ ASSERT(Status == AGESA_SUCCESS); - } - - return Status; -} - -AGESA_STATUS agesawrapper_readeventlog(UINT8 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;