MdeModulePkg/FirmwarePerfSmm:Enhance for new pref infrastructure

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.gao@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
index c750331374487318585339972f07d3e29a8c2ae4..d4ac849ed0033d69a3498fba5f170c64c8709faf 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
@@ -40,13 +40,12 @@
 #include <Library/SynchronizationLib.h>\r
 #include <Library/SmmMemLib.h>\r
 \r
-#define EXTENSION_RECORD_SIZE     0x1000\r
+SMM_BOOT_PERFORMANCE_TABLE    *mSmmBootPerformanceTable = NULL;\r
 \r
 EFI_SMM_RSC_HANDLER_PROTOCOL  *mRscHandlerProtocol    = NULL;\r
 UINT64                        mSuspendStartTime       = 0;\r
 BOOLEAN                       mS3SuspendLockBoxSaved  = FALSE;\r
 UINT32                        mBootRecordSize = 0;\r
-UINT32                        mBootRecordMaxSize = 0;\r
 UINT8                         *mBootRecordBuffer = NULL;\r
 \r
 SPIN_LOCK                     mSmmFpdtLock;\r
@@ -84,7 +83,6 @@ FpdtStatusCodeListenerSmm (
   EFI_STATUS                           Status;\r
   UINT64                               CurrentTime;\r
   EFI_ACPI_5_0_FPDT_S3_SUSPEND_RECORD  S3SuspendRecord;\r
-  UINT8                                *NewRecordBuffer;\r
 \r
   //\r
   // Check whether status code is what we are interested in.\r
@@ -96,32 +94,14 @@ FpdtStatusCodeListenerSmm (
   //\r
   // Collect one or more Boot records in boot time\r
   //\r
-  if (Data != NULL && CompareGuid (&Data->Type, &gEfiFirmwarePerformanceGuid)) {\r
+  if (Data != NULL && CompareGuid (&Data->Type, &gEdkiiFpdtExtendedFirmwarePerformanceGuid)) {\r
     AcquireSpinLock (&mSmmFpdtLock);\r
-    \r
-    if (mBootRecordSize + Data->Size > mBootRecordMaxSize) {\r
-      //\r
-      // Try to allocate big SMRAM data to store Boot record. \r
-      //\r
-      if (mSmramIsOutOfResource) {\r
-        ReleaseSpinLock (&mSmmFpdtLock);\r
-        return EFI_OUT_OF_RESOURCES;\r
-      }\r
-      NewRecordBuffer = ReallocatePool (mBootRecordSize, mBootRecordSize + Data->Size + EXTENSION_RECORD_SIZE, mBootRecordBuffer); \r
-      if (NewRecordBuffer == NULL) {\r
-        ReleaseSpinLock (&mSmmFpdtLock);\r
-        mSmramIsOutOfResource = TRUE;\r
-        return EFI_OUT_OF_RESOURCES;\r
-      }\r
-      mBootRecordBuffer  = NewRecordBuffer;\r
-      mBootRecordMaxSize = mBootRecordSize + Data->Size + EXTENSION_RECORD_SIZE;\r
-    }\r
     //\r
-    // Save boot record into the temp memory space.\r
+    // Get the boot performance data.\r
     //\r
-    CopyMem (mBootRecordBuffer + mBootRecordSize, Data + 1, Data->Size);\r
-    mBootRecordSize += Data->Size;\r
-    \r
+    CopyMem (&mSmmBootPerformanceTable, Data + 1, Data->Size);\r
+    mBootRecordBuffer = ((UINT8 *) (mSmmBootPerformanceTable)) + sizeof (SMM_BOOT_PERFORMANCE_TABLE);\r
+\r
     ReleaseSpinLock (&mSmmFpdtLock);\r
     return EFI_SUCCESS;\r
   }\r
@@ -239,6 +219,9 @@ FpdtSmiHandler (
 \r
   switch (SmmCommData->Function) {\r
     case SMM_FPDT_FUNCTION_GET_BOOT_RECORD_SIZE :\r
+      if (mSmmBootPerformanceTable != NULL) {\r
+        mBootRecordSize = mSmmBootPerformanceTable->Header.Length - sizeof (SMM_BOOT_PERFORMANCE_TABLE);\r
+      }\r
       SmmCommData->BootRecordSize = mBootRecordSize;\r
       break;\r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
index 724e7bcd1d5a1eb76f6ef939948d2d2bdf51bf40..cae01110d13e5abea9b65abd5f642993916c9bc7 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
@@ -60,6 +60,7 @@
   ## PRODUCES             ## UNDEFINED # SmiHandlerRegister\r
   ## SOMETIMES_CONSUMES   ## UNDEFINED # StatusCode Data\r
   gEfiFirmwarePerformanceGuid\r
+  gEdkiiFpdtExtendedFirmwarePerformanceGuid  ## SOMETIMES_PRODUCES ## UNDEFINED # StatusCode Data\r
 \r
 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeS3SuspendStart  ## CONSUMES\r