V3:
a. Remove unused definitions
b. Get records size form the records buffer when getting size action
is triggered.
V2:
Update FirmwarePerformanceSmm to receive the address
of performance records instead of records content.
Receive buffer address of Boot performance records
which are reported by SmmCorePerformanceLib.
Cc: Liming Gao <liming....@intel.com>
Cc: Star Zeng <star.z...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan...@intel.com>
---
.../FirmwarePerformanceSmm.c | 35 ++++++----------------
.../FirmwarePerformanceSmm.inf | 1 +
2 files changed, 10 insertions(+), 26 deletions(-)
diff --git
a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
index c750331..d4ac849 100644
---
a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
+++
b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
@@ -38,17 +38,16 @@
#include <Library/MemoryAllocationLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/SynchronizationLib.h>
#include <Library/SmmMemLib.h>
-#define EXTENSION_RECORD_SIZE 0x1000
+SMM_BOOT_PERFORMANCE_TABLE *mSmmBootPerformanceTable = NULL;
EFI_SMM_RSC_HANDLER_PROTOCOL *mRscHandlerProtocol = NULL;
UINT64 mSuspendStartTime = 0;
BOOLEAN mS3SuspendLockBoxSaved = FALSE;
UINT32 mBootRecordSize = 0;
-UINT32 mBootRecordMaxSize = 0;
UINT8 *mBootRecordBuffer = NULL;
SPIN_LOCK mSmmFpdtLock;
BOOLEAN mSmramIsOutOfResource = FALSE;
@@ -82,11 +81,10 @@ FpdtStatusCodeListenerSmm (
)
{
EFI_STATUS Status;
UINT64 CurrentTime;
EFI_ACPI_5_0_FPDT_S3_SUSPEND_RECORD S3SuspendRecord;
- UINT8 *NewRecordBuffer;
//
// Check whether status code is what we are interested in.
//
if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) != EFI_PROGRESS_CODE) {
@@ -94,36 +92,18 @@ FpdtStatusCodeListenerSmm (
}
//
// Collect one or more Boot records in boot time
//
- if (Data != NULL && CompareGuid (&Data->Type, &gEfiFirmwarePerformanceGuid))
{
+ if (Data != NULL && CompareGuid (&Data->Type,
&gEdkiiFpdtExtendedFirmwarePerformanceGuid)) {
AcquireSpinLock (&mSmmFpdtLock);
-
- if (mBootRecordSize + Data->Size > mBootRecordMaxSize) {
- //
- // Try to allocate big SMRAM data to store Boot record.
- //
- if (mSmramIsOutOfResource) {
- ReleaseSpinLock (&mSmmFpdtLock);
- return EFI_OUT_OF_RESOURCES;
- }
- NewRecordBuffer = ReallocatePool (mBootRecordSize, mBootRecordSize +
Data->Size + EXTENSION_RECORD_SIZE, mBootRecordBuffer);
- if (NewRecordBuffer == NULL) {
- ReleaseSpinLock (&mSmmFpdtLock);
- mSmramIsOutOfResource = TRUE;
- return EFI_OUT_OF_RESOURCES;
- }
- mBootRecordBuffer = NewRecordBuffer;
- mBootRecordMaxSize = mBootRecordSize + Data->Size +
EXTENSION_RECORD_SIZE;
- }
//
- // Save boot record into the temp memory space.
+ // Get the boot performance data.
//
- CopyMem (mBootRecordBuffer + mBootRecordSize, Data + 1, Data->Size);
- mBootRecordSize += Data->Size;
-
+ CopyMem (&mSmmBootPerformanceTable, Data + 1, Data->Size);
+ mBootRecordBuffer = ((UINT8 *) (mSmmBootPerformanceTable)) + sizeof
(SMM_BOOT_PERFORMANCE_TABLE);
+
ReleaseSpinLock (&mSmmFpdtLock);
return EFI_SUCCESS;
}
if ((Value != PcdGet32 (PcdProgressCodeS3SuspendStart)) &&
@@ -237,10 +217,13 @@ FpdtSmiHandler (
Status = EFI_SUCCESS;
switch (SmmCommData->Function) {
case SMM_FPDT_FUNCTION_GET_BOOT_RECORD_SIZE :
+ if (mSmmBootPerformanceTable != NULL) {
+ mBootRecordSize = mSmmBootPerformanceTable->Header.Length - sizeof
(SMM_BOOT_PERFORMANCE_TABLE);
+ }
SmmCommData->BootRecordSize = mBootRecordSize;
break;
case SMM_FPDT_FUNCTION_GET_BOOT_RECORD_DATA :
Status = EFI_UNSUPPORTED;
diff --git
a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
index 724e7bc..cae0111 100644
---
a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
+++
b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
@@ -58,10 +58,11 @@
[Guids]
## SOMETIMES_PRODUCES ## UNDEFINED # SaveLockBox
## PRODUCES ## UNDEFINED # SmiHandlerRegister
## SOMETIMES_CONSUMES ## UNDEFINED # StatusCode Data
gEfiFirmwarePerformanceGuid
+ gEdkiiFpdtExtendedFirmwarePerformanceGuid ## SOMETIMES_PRODUCES ##
UNDEFINED # StatusCode Data
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeS3SuspendStart ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeS3SuspendEnd ## CONSUMES
--
1.9.5.msysgit.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
