From 19d29d358f80a1f2b462d8a52943aae724b8702c Mon Sep 17 00:00:00 2001 From: "Yarlagadda, Satya P" Date: Fri, 21 Oct 2016 13:49:24 +0800 Subject: IntelFsp2Pkg: Added changes to enable FPDT performance measurements IntelFsp2Pkg: 1.Defined performance measure mask to mask the Perf id (Bits 63:56) of the Perf Data from FSP Global data. 2.Replaced the hard coded perf ids to use the standard defines from FspStatuscode.h 3.Add the PerfData form Fsp Global data ( for TempRaminit entry, TempramInit exit, memoryinit entry) to FPDT entries IntelFsp2WrapperPkg: Moved the code to add the FSP FPDT records and wrapper FPDT records from ReadytoBoot event to EndofFirmware event Cc: Maurice Ma Cc: Jiewen Yao Cc: Giri P Mudusuru Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Satya Yarlagadda Reviewed-by: Maurice Ma Reviewed-by: Jiewen Yao --- .../FspWrapperNotifyDxe/FspWrapperNotifyDxe.c | 55 +++++++++++----------- 1 file changed, 27 insertions(+), 28 deletions(-) (limited to 'IntelFsp2WrapperPkg/FspWrapperNotifyDxe') diff --git a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c index 0797f44a68..a69263278d 100644 --- a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c +++ b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c @@ -25,6 +25,7 @@ #include #include #include +#include typedef EFI_STATUS @@ -91,9 +92,9 @@ OnPciEnumerationComplete ( } NotifyPhaseParams.Phase = EnumInitPhaseAfterPciEnumeration; - PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, 0x6000); + PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY); Status = CallFspNotifyPhase (&NotifyPhaseParams); - PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, 0x607F); + PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT); // // Reset the system if FSP API returned FSP_STATUS_RESET_REQUIRED status @@ -130,16 +131,13 @@ OnReadyToBoot ( { NOTIFY_PHASE_PARAMS NotifyPhaseParams; EFI_STATUS Status; - ADD_PERFORMANCE_RECORD_PROTOCOL *AddPerfRecordInterface; - EFI_PEI_HOB_POINTERS Hob; - VOID **FspHobListPtr; gBS->CloseEvent (Event); NotifyPhaseParams.Phase = EnumInitPhaseReadyToBoot; - PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, 0x4000); + PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY); Status = CallFspNotifyPhase (&NotifyPhaseParams); - PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, 0x407F); + PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT); // // Reset the system if FSP API returned FSP_STATUS_RESET_REQUIRED status @@ -154,23 +152,6 @@ OnReadyToBoot ( } else { DEBUG((DEBUG_INFO, "FSP NotifyPhase ReadyToBoot Success.\n")); } - - Status = gBS->LocateProtocol ( - &gAddPerfRecordProtocolGuid, - NULL, - (VOID**) &AddPerfRecordInterface - ); - if (EFI_ERROR (Status)) { - DEBUG((DEBUG_INFO, "gAddPerfRecordProtocolGuid - Locate protocol failed\n")); - return; - } else { - Hob.Raw = GetHobList (); - if (Hob.Raw != NULL) { - Hob.Raw = GetNextGuidHob (&gFspHobGuid, Hob.Raw); - FspHobListPtr = GET_GUID_HOB_DATA(Hob.Raw); - AddPerfRecordInterface->AddPerformanceRecords((VOID *)(UINTN)(((UINT32)(UINTN)*FspHobListPtr) & 0xFFFFFFFF)); - } - } } /** @@ -189,15 +170,18 @@ OnEndOfFirmware ( IN VOID *Context ) { - NOTIFY_PHASE_PARAMS NotifyPhaseParams; - EFI_STATUS Status; + NOTIFY_PHASE_PARAMS NotifyPhaseParams; + EFI_STATUS Status; + ADD_PERFORMANCE_RECORD_PROTOCOL *AddPerfRecordInterface; + EFI_PEI_HOB_POINTERS Hob; + VOID **FspHobListPtr; gBS->CloseEvent (Event); NotifyPhaseParams.Phase = EnumInitPhaseEndOfFirmware; - PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, 0x2000); + PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY); Status = CallFspNotifyPhase (&NotifyPhaseParams); - PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, 0x207F); + PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT); // // Reset the system if FSP API returned FSP_STATUS_RESET_REQUIRED status @@ -212,6 +196,21 @@ OnEndOfFirmware ( } else { DEBUG((DEBUG_INFO, "FSP NotifyPhase EndOfFirmware Success.\n")); } + Status = gBS->LocateProtocol ( + &gAddPerfRecordProtocolGuid, + NULL, + (VOID**) &AddPerfRecordInterface + ); + if (EFI_ERROR (Status)) { + DEBUG((DEBUG_INFO, "gAddPerfRecordProtocolGuid - Locate protocol failed\n")); + return; + } else { + Hob.Raw = GetFirstGuidHob (&gFspHobGuid); + if (Hob.Raw != NULL) { + FspHobListPtr = GET_GUID_HOB_DATA (Hob.Raw); + AddPerfRecordInterface->AddPerformanceRecords ((VOID *)(UINTN)(((UINT32)(UINTN)*FspHobListPtr) & 0xFFFFFFFF)); + } + } } /** -- cgit v1.2.3