]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
MdeModulePkg: Replace BSD License with BSD+Patent License
[mirror_edk2.git] / MdeModulePkg / Universal / Acpi / FirmwarePerformanceDataTableDxe / FirmwarePerformanceDxe.c
index dae12a4869004a63e2f55f5159fc850a5bc1ea56..9713048f1f0393f160c3827e3ab31be19a4921ba 100644 (file)
@@ -2,17 +2,11 @@
   This module install ACPI Firmware Performance Data Table (FPDT).\r
 \r
   This module register report status code listener to collect performance data\r
-  for Firmware Basic Boot Performance Record and other boot performance records, \r
+  for Firmware Basic Boot Performance Record and other boot performance records,\r
   and install FPDT to ACPI table.\r
 \r
-  Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
 \r
 #include <Protocol/ReportStatusCodeHandler.h>\r
 #include <Protocol/AcpiTable.h>\r
-#include <Protocol/SmmCommunication.h>\r
+#include <Protocol/LockBox.h>\r
+#include <Protocol/Variable.h>\r
 \r
 #include <Guid/Acpi.h>\r
 #include <Guid/FirmwarePerformance.h>\r
-#include <Guid/EventGroup.h>\r
-#include <Guid/EventLegacyBios.h>\r
 \r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
+#include <Library/DxeServicesLib.h>\r
 #include <Library/TimerLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/HobLib.h>\r
-#include <Library/PcdLib.h>\r
+#include <Library/LockBoxLib.h>\r
+#include <Library/UefiLib.h>\r
 \r
-//\r
-// ACPI table information used to initialize tables.\r
-//\r
-#define EFI_ACPI_OEM_ID           "INTEL"\r
-#define EFI_ACPI_OEM_TABLE_ID     0x2020204F4E414954ULL // "TIANO   "\r
-#define EFI_ACPI_OEM_REVISION     0x00000001\r
-#define EFI_ACPI_CREATOR_ID       0x5446534D            // TBD "MSFT"\r
-#define EFI_ACPI_CREATOR_REVISION 0x01000013            // TBD\r
-#define EXTENSION_RECORD_SIZE     0x10000\r
-#define SMM_BOOT_RECORD_COMM_SIZE OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data) + sizeof(SMM_BOOT_RECORD_COMMUNICATE)\r
+#define SMM_BOOT_RECORD_COMM_SIZE (OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data) + sizeof(SMM_BOOT_RECORD_COMMUNICATE))\r
 \r
 EFI_RSC_HANDLER_PROTOCOL    *mRscHandlerProtocol = NULL;\r
 \r
+BOOLEAN                     mLockBoxReady = FALSE;\r
 EFI_EVENT                   mReadyToBootEvent;\r
 EFI_EVENT                   mLegacyBootEvent;\r
 EFI_EVENT                   mExitBootServicesEvent;\r
 UINTN                       mFirmwarePerformanceTableTemplateKey  = 0;\r
-UINT32                      mBootRecordSize = 0;\r
-UINT32                      mBootRecordMaxSize = 0;\r
-UINT8                       *mBootRecordBuffer = NULL;\r
+BOOLEAN                     mDxeCoreReportStatusCodeEnable = FALSE;\r
 \r
 BOOT_PERFORMANCE_TABLE                      *mAcpiBootPerformanceTable = NULL;\r
+BOOT_PERFORMANCE_TABLE                      *mReceivedAcpiBootPerformanceTable = NULL;\r
 S3_PERFORMANCE_TABLE                        *mAcpiS3PerformanceTable   = NULL;\r
 \r
 FIRMWARE_PERFORMANCE_TABLE  mFirmwarePerformanceTableTemplate = {\r
@@ -69,13 +55,13 @@ FIRMWARE_PERFORMANCE_TABLE  mFirmwarePerformanceTableTemplate = {
     EFI_ACPI_5_0_FIRMWARE_PERFORMANCE_DATA_TABLE_REVISION,    // Revision\r
     0x00, // Checksum will be updated at runtime\r
     //\r
-    // It is expected that these values will be updated at runtime.\r
+    // It is expected that these values will be updated at EntryPoint.\r
     //\r
-    EFI_ACPI_OEM_ID,            // OEMID is a 6 bytes long field\r
-    EFI_ACPI_OEM_TABLE_ID,      // OEM table identification(8 bytes long)\r
-    EFI_ACPI_OEM_REVISION,      // OEM revision number\r
-    EFI_ACPI_CREATOR_ID,        // ASL compiler vendor ID\r
-    EFI_ACPI_CREATOR_REVISION,  // ASL compiler revision number\r
+    {0x00},     // OEM ID is a 6 bytes long field\r
+    0x00,       // OEM Table ID(8 bytes long)\r
+    0x00,       // OEM Revision\r
+    0x00,       // Creator ID\r
+    0x00,       // Creator Revision\r
   },\r
   //\r
   // Firmware Basic Boot Performance Table Pointer Record.\r
@@ -187,40 +173,98 @@ FpdtAcpiTableChecksum (
 }\r
 \r
 /**\r
-  Allocate EfiReservedMemoryType below 4G memory address.\r
-\r
-  This function allocates EfiReservedMemoryType below 4G memory address.\r
-\r
-  @param[in]  Size   Size of memory to allocate.\r
-\r
-  @return Allocated address for output.\r
+  Callback function upon VariableArchProtocol and LockBoxProtocol\r
+  to allocate S3 performance table memory and save the pointer to LockBox.\r
 \r
+  @param[in] Event    Event whose notification function is being invoked.\r
+  @param[in] Context  Pointer to the notification function's context.\r
 **/\r
-VOID *\r
-FpdtAllocateReservedMemoryBelow4G (\r
-  IN UINTN       Size\r
+VOID\r
+EFIAPI\r
+FpdtAllocateS3PerformanceTableMemory (\r
+  IN  EFI_EVENT                             Event,\r
+  IN  VOID                                  *Context\r
   )\r
 {\r
-  UINTN                 Pages;\r
-  EFI_PHYSICAL_ADDRESS  Address;\r
-  EFI_STATUS            Status;\r
-  VOID                  *Buffer;\r
-\r
-  Pages   = EFI_SIZE_TO_PAGES (Size);\r
-  Address = 0xffffffff;\r
-\r
-  Status = gBS->AllocatePages (\r
-                  AllocateMaxAddress,\r
-                  EfiReservedMemoryType,\r
-                  Pages,\r
-                  &Address\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
+  EFI_STATUS                    Status;\r
+  VOID                          *Interface;\r
+  FIRMWARE_PERFORMANCE_VARIABLE PerformanceVariable;\r
+  UINTN                         Size;\r
+  EFI_PHYSICAL_ADDRESS          S3PerformanceTablePointer;\r
+\r
+  if (mLockBoxReady && (mAcpiS3PerformanceTable != NULL)) {\r
+    //\r
+    // The memory for S3 performance table should have been ready,\r
+    // and the pointer should have been saved to LockBox, just return.\r
+    //\r
+    return;\r
+  }\r
+\r
+  if (!mLockBoxReady) {\r
+    Status = gBS->LocateProtocol (&gEfiLockBoxProtocolGuid, NULL, &Interface);\r
+    if (!EFI_ERROR (Status)) {\r
+      //\r
+      // LockBox services has been ready.\r
+      //\r
+      mLockBoxReady = TRUE;\r
+    }\r
+  }\r
 \r
-  Buffer = (VOID *) (UINTN) Address;\r
-  ZeroMem (Buffer, Size);\r
+  if (mAcpiS3PerformanceTable == NULL) {\r
+    Status = gBS->LocateProtocol (&gEfiVariableArchProtocolGuid, NULL, &Interface);\r
+    if (!EFI_ERROR (Status)) {\r
+      //\r
+      // Try to allocate the same runtime buffer as last time boot.\r
+      //\r
+      ZeroMem (&PerformanceVariable, sizeof (PerformanceVariable));\r
+      Size = sizeof (PerformanceVariable);\r
+      Status = gRT->GetVariable (\r
+                      EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,\r
+                      &gEfiFirmwarePerformanceGuid,\r
+                      NULL,\r
+                      &Size,\r
+                      &PerformanceVariable\r
+                      );\r
+      if (!EFI_ERROR (Status)) {\r
+        Status = gBS->AllocatePages (\r
+                        AllocateAddress,\r
+                        EfiReservedMemoryType,\r
+                        EFI_SIZE_TO_PAGES (sizeof (S3_PERFORMANCE_TABLE)),\r
+                        &PerformanceVariable.S3PerformanceTablePointer\r
+                        );\r
+        if (!EFI_ERROR (Status)) {\r
+          mAcpiS3PerformanceTable = (S3_PERFORMANCE_TABLE *) (UINTN) PerformanceVariable.S3PerformanceTablePointer;\r
+        }\r
+      }\r
+      if (mAcpiS3PerformanceTable == NULL) {\r
+        //\r
+        // Fail to allocate at specified address, continue to allocate at any address.\r
+        //\r
+        mAcpiS3PerformanceTable = (S3_PERFORMANCE_TABLE *) AllocatePeiAccessiblePages (\r
+                                                             EfiReservedMemoryType,\r
+                                                             EFI_SIZE_TO_PAGES (sizeof (S3_PERFORMANCE_TABLE))\r
+                                                             );\r
+      }\r
+      DEBUG ((EFI_D_INFO, "FPDT: ACPI S3 Performance Table address = 0x%x\n", mAcpiS3PerformanceTable));\r
+      if (mAcpiS3PerformanceTable != NULL) {\r
+        CopyMem (mAcpiS3PerformanceTable, &mS3PerformanceTableTemplate, sizeof (mS3PerformanceTableTemplate));\r
+      }\r
+    }\r
+  }\r
 \r
-  return Buffer;\r
+  if (mLockBoxReady && (mAcpiS3PerformanceTable != NULL)) {\r
+    //\r
+    // If LockBox services has been ready and memory for FPDT S3 performance table has been allocated,\r
+    // save the pointer to LockBox for use in S3 resume.\r
+    //\r
+    S3PerformanceTablePointer = (EFI_PHYSICAL_ADDRESS) (UINTN) mAcpiS3PerformanceTable;\r
+    Status = SaveLockBox (\r
+               &gFirmwarePerformanceS3PointerGuid,\r
+               &S3PerformanceTablePointer,\r
+               sizeof (EFI_PHYSICAL_ADDRESS)\r
+               );\r
+    ASSERT_EFI_ERROR (Status);\r
+  }\r
 }\r
 \r
 /**\r
@@ -236,17 +280,9 @@ InstallFirmwarePerformanceDataTable (
 {\r
   EFI_STATUS                    Status;\r
   EFI_ACPI_TABLE_PROTOCOL       *AcpiTableProtocol;\r
-  EFI_PHYSICAL_ADDRESS          Address;\r
-  UINTN                         Size;\r
-  UINT8                         *SmmBootRecordCommBuffer;\r
-  EFI_SMM_COMMUNICATE_HEADER    *SmmCommBufferHeader;\r
-  SMM_BOOT_RECORD_COMMUNICATE   *SmmCommData;\r
-  UINTN                         CommSize;\r
-  UINTN                         PerformanceRuntimeDataSize;\r
-  UINT8                         *PerformanceRuntimeData; \r
-  UINT8                         *PerformanceRuntimeDataHead; \r
-  EFI_SMM_COMMUNICATION_PROTOCOL  *Communication;\r
+  UINTN                         BootPerformanceDataSize;\r
   FIRMWARE_PERFORMANCE_VARIABLE PerformanceVariable;\r
+  UINTN                         Size;\r
 \r
   //\r
   // Get AcpiTable Protocol.\r
@@ -256,154 +292,54 @@ InstallFirmwarePerformanceDataTable (
     return Status;\r
   }\r
 \r
-  //\r
-  // Collect boot records from SMM drivers.\r
-  //\r
-  SmmBootRecordCommBuffer = AllocateZeroPool (SMM_BOOT_RECORD_COMM_SIZE);\r
-  ASSERT (SmmBootRecordCommBuffer != NULL);\r
-  SmmCommData = NULL;\r
-  Status = gBS->LocateProtocol (&gEfiSmmCommunicationProtocolGuid, NULL, (VOID **) &Communication);\r
-  if (!EFI_ERROR (Status)) {\r
-    //\r
-    // Initialize communicate buffer \r
-    //\r
-    SmmCommBufferHeader = (EFI_SMM_COMMUNICATE_HEADER*)SmmBootRecordCommBuffer;\r
-    SmmCommData = (SMM_BOOT_RECORD_COMMUNICATE*)SmmCommBufferHeader->Data;\r
-    ZeroMem((UINT8*)SmmCommData, sizeof(SMM_BOOT_RECORD_COMMUNICATE));\r
-\r
-    CopyGuid (&SmmCommBufferHeader->HeaderGuid, &gEfiFirmwarePerformanceGuid);\r
-    SmmCommBufferHeader->MessageLength = sizeof(SMM_BOOT_RECORD_COMMUNICATE);\r
-    CommSize = SMM_BOOT_RECORD_COMM_SIZE;\r
-  \r
-    //\r
-    // Get the size of boot records.\r
+  if (mReceivedAcpiBootPerformanceTable != NULL) {\r
+    mAcpiBootPerformanceTable = mReceivedAcpiBootPerformanceTable;\r
+    mAcpiBootPerformanceTable->BasicBoot.ResetEnd = mBootPerformanceTableTemplate.BasicBoot.ResetEnd;\r
+  } else {\r
     //\r
-    SmmCommData->Function       = SMM_FPDT_FUNCTION_GET_BOOT_RECORD_SIZE;\r
-    SmmCommData->BootRecordData = NULL;\r
-    Status = Communication->Communicate (Communication, SmmBootRecordCommBuffer, &CommSize);\r
-    ASSERT_EFI_ERROR (Status);\r
-  \r
-    if (!EFI_ERROR (SmmCommData->ReturnStatus) && SmmCommData->BootRecordSize != 0) {\r
-      //\r
-      // Get all boot records\r
-      //\r
-      SmmCommData->Function       = SMM_FPDT_FUNCTION_GET_BOOT_RECORD_DATA;\r
-      SmmCommData->BootRecordData = AllocateZeroPool(SmmCommData->BootRecordSize);\r
-      ASSERT (SmmCommData->BootRecordData != NULL);\r
-      \r
-      Status = Communication->Communicate (Communication, SmmBootRecordCommBuffer, &CommSize);\r
-      ASSERT_EFI_ERROR (Status);\r
-      ASSERT_EFI_ERROR(SmmCommData->ReturnStatus);\r
-    }\r
-  }\r
-  FreePool (SmmBootRecordCommBuffer);\r
-\r
-  //\r
-  // Prepare memory for runtime Performance Record. \r
-  // Runtime performance records includes two tables S3 performance table and Boot performance table. \r
-  // S3 Performance table includes S3Resume and S3Suspend records. \r
-  // Boot Performance table includes BasicBoot record, and one or more appended Boot Records. \r
-  //\r
-  PerformanceRuntimeData = NULL;\r
-  PerformanceRuntimeDataSize = sizeof (S3_PERFORMANCE_TABLE) + sizeof (BOOT_PERFORMANCE_TABLE) + mBootRecordSize + PcdGet32 (PcdExtFpdtBootRecordPadSize);\r
-  if (SmmCommData != NULL) {\r
-    PerformanceRuntimeDataSize += SmmCommData->BootRecordSize;\r
-  }\r
-\r
-  //\r
-  // Try to allocate the same runtime buffer as last time boot.\r
-  //\r
-  ZeroMem (&PerformanceVariable, sizeof (PerformanceVariable));\r
-  Size = sizeof (PerformanceVariable);\r
-  Status = gRT->GetVariable (\r
-                  EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,\r
-                  &gEfiFirmwarePerformanceGuid,\r
-                  NULL,\r
-                  &Size,\r
-                  &PerformanceVariable\r
-                  );\r
-  if (!EFI_ERROR (Status)) {\r
-    Address = PerformanceVariable.S3PerformanceTablePointer;\r
-    Status = gBS->AllocatePages (\r
-                    AllocateAddress,\r
-                    EfiReservedMemoryType,\r
-                    EFI_SIZE_TO_PAGES (PerformanceRuntimeDataSize),\r
-                    &Address\r
+    // Try to allocate the same runtime buffer as last time boot.\r
+    //\r
+    BootPerformanceDataSize = sizeof (BOOT_PERFORMANCE_TABLE);\r
+    ZeroMem (&PerformanceVariable, sizeof (PerformanceVariable));\r
+    Size = sizeof (PerformanceVariable);\r
+    Status = gRT->GetVariable (\r
+                    EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,\r
+                    &gEfiFirmwarePerformanceGuid,\r
+                    NULL,\r
+                    &Size,\r
+                    &PerformanceVariable\r
                     );\r
     if (!EFI_ERROR (Status)) {\r
-      PerformanceRuntimeData = (UINT8 *) (UINTN) Address;\r
+      Status = gBS->AllocatePages (\r
+                      AllocateAddress,\r
+                      EfiReservedMemoryType,\r
+                      EFI_SIZE_TO_PAGES (BootPerformanceDataSize),\r
+                      &PerformanceVariable.BootPerformanceTablePointer\r
+                      );\r
+      if (!EFI_ERROR (Status)) {\r
+         mAcpiBootPerformanceTable = (BOOT_PERFORMANCE_TABLE *) (UINTN) PerformanceVariable.BootPerformanceTablePointer;\r
+      }\r
     }\r
-  }\r
-\r
-  if (PerformanceRuntimeData == NULL) {\r
-    //\r
-    // Fail to allocate at specified address, continue to allocate at any address.\r
-    //\r
-    PerformanceRuntimeData = FpdtAllocateReservedMemoryBelow4G (PerformanceRuntimeDataSize);\r
-  }\r
-  DEBUG ((EFI_D_INFO, "FPDT: Performance Runtime Data address = 0x%x\n", PerformanceRuntimeData));\r
-\r
-  if (PerformanceRuntimeData == NULL) {\r
-    if (SmmCommData != NULL && SmmCommData->BootRecordData != NULL) {\r
-      FreePool (SmmCommData->BootRecordData);\r
+    if (mAcpiBootPerformanceTable == NULL) {\r
+      //\r
+      // Fail to allocate at specified address, continue to allocate at any address.\r
+      //\r
+      mAcpiBootPerformanceTable = (BOOT_PERFORMANCE_TABLE *) AllocatePeiAccessiblePages (\r
+                                                               EfiReservedMemoryType,\r
+                                                               EFI_SIZE_TO_PAGES (BootPerformanceDataSize)\r
+                                                               );\r
+    }\r
+    DEBUG ((DEBUG_INFO, "FPDT: ACPI Boot Performance Table address = 0x%x\n", mAcpiBootPerformanceTable));\r
+    if (mAcpiBootPerformanceTable == NULL) {\r
+      return EFI_OUT_OF_RESOURCES;\r
     }\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
-  \r
-  PerformanceRuntimeDataHead = PerformanceRuntimeData;\r
-\r
-  if (FeaturePcdGet (PcdFirmwarePerformanceDataTableS3Support)) {\r
-    //\r
-    // Prepare S3 Performance Table.\r
-    //\r
-    mAcpiS3PerformanceTable = (S3_PERFORMANCE_TABLE *) PerformanceRuntimeData;\r
-    CopyMem (mAcpiS3PerformanceTable, &mS3PerformanceTableTemplate, sizeof (mS3PerformanceTableTemplate));\r
-    PerformanceRuntimeData  = PerformanceRuntimeData + mAcpiS3PerformanceTable->Header.Length;\r
-    DEBUG ((EFI_D_INFO, "FPDT: ACPI S3 Performance Table address = 0x%x\n", mAcpiS3PerformanceTable));\r
-    //\r
-    // Save S3 Performance Table address to Variable for use in Firmware Performance PEIM.\r
-    //\r
-    PerformanceVariable.S3PerformanceTablePointer = (EFI_PHYSICAL_ADDRESS) (UINTN) mAcpiS3PerformanceTable;\r
-    //\r
-    // Update S3 Performance Table Pointer in template.\r
-    //\r
-    mFirmwarePerformanceTableTemplate.S3PointerRecord.S3PerformanceTablePointer = (UINT64) PerformanceVariable.S3PerformanceTablePointer;\r
-  } else {\r
     //\r
-    // Exclude S3 Performance Table Pointer from FPDT table template.\r
+    // Fill Basic Boot record to Boot Performance Table.\r
     //\r
-    mFirmwarePerformanceTableTemplate.Header.Length -= sizeof (EFI_ACPI_5_0_FPDT_S3_PERFORMANCE_TABLE_POINTER_RECORD);\r
+    CopyMem (mAcpiBootPerformanceTable, &mBootPerformanceTableTemplate, sizeof (mBootPerformanceTableTemplate));\r
   }\r
+  BootPerformanceDataSize   = mAcpiBootPerformanceTable->Header.Length;\r
 \r
-  //\r
-  // Prepare Boot Performance Table.\r
-  //\r
-  mAcpiBootPerformanceTable = (BOOT_PERFORMANCE_TABLE *) PerformanceRuntimeData;\r
-  //\r
-  // Fill Basic Boot record to Boot Performance Table.\r
-  //\r
-  CopyMem (PerformanceRuntimeData, &mBootPerformanceTableTemplate, sizeof (mBootPerformanceTableTemplate));\r
-  PerformanceRuntimeData = PerformanceRuntimeData + mAcpiBootPerformanceTable->Header.Length;\r
-  //\r
-  // Fill Boot records from boot drivers.\r
-  //\r
-  CopyMem (PerformanceRuntimeData, mBootRecordBuffer, mBootRecordSize);\r
-  mAcpiBootPerformanceTable->Header.Length += mBootRecordSize;\r
-  PerformanceRuntimeData = PerformanceRuntimeData + mBootRecordSize;\r
-  if (SmmCommData != NULL && SmmCommData->BootRecordData != NULL) {\r
-    //\r
-    // Fill Boot records from SMM drivers.\r
-    //\r
-    CopyMem (PerformanceRuntimeData, SmmCommData->BootRecordData, SmmCommData->BootRecordSize);\r
-    FreePool (SmmCommData->BootRecordData);\r
-    mAcpiBootPerformanceTable->Header.Length = (UINT32) (mAcpiBootPerformanceTable->Header.Length + SmmCommData->BootRecordSize);\r
-    PerformanceRuntimeData = PerformanceRuntimeData + SmmCommData->BootRecordSize;\r
-  }\r
-  //\r
-  // Reserve space for boot records after ReadyToBoot.\r
-  //\r
-  PerformanceRuntimeData = PerformanceRuntimeData + PcdGet32 (PcdExtFpdtBootRecordPadSize);\r
-  DEBUG ((EFI_D_INFO, "FPDT: ACPI Boot Performance Table address = 0x%x\n", mAcpiBootPerformanceTable));\r
   //\r
   // Save Boot Performance Table address to Variable for use in S4 resume.\r
   //\r
@@ -413,17 +349,25 @@ InstallFirmwarePerformanceDataTable (
   //\r
   mFirmwarePerformanceTableTemplate.BootPointerRecord.BootPerformanceTablePointer = (UINT64) (UINTN) mAcpiBootPerformanceTable;\r
 \r
+  //\r
+  // Save S3 Performance Table address to Variable for use in S4 resume.\r
+  //\r
+  PerformanceVariable.S3PerformanceTablePointer = (EFI_PHYSICAL_ADDRESS) (UINTN) mAcpiS3PerformanceTable;\r
+  //\r
+  // Update S3 Performance Table Pointer in template.\r
+  //\r
+  mFirmwarePerformanceTableTemplate.S3PointerRecord.S3PerformanceTablePointer = (UINT64) (UINTN) mAcpiS3PerformanceTable;\r
   //\r
   // Save Runtime Performance Table pointers to Variable.\r
+  // Don't check SetVariable return status. It doesn't impact FPDT table generation.\r
   //\r
-  Status = gRT->SetVariable (\r
-                  EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,\r
-                  &gEfiFirmwarePerformanceGuid,\r
-                  EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
-                  sizeof (PerformanceVariable),\r
-                  &PerformanceVariable\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
+  gRT->SetVariable (\r
+        EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,\r
+        &gEfiFirmwarePerformanceGuid,\r
+        EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
+        sizeof (PerformanceVariable),\r
+        &PerformanceVariable\r
+        );\r
 \r
   //\r
   // Publish Firmware Performance Data Table.\r
@@ -436,127 +380,19 @@ InstallFirmwarePerformanceDataTable (
                                 &mFirmwarePerformanceTableTemplateKey\r
                                 );\r
   if (EFI_ERROR (Status)) {\r
-    FreePool (PerformanceRuntimeDataHead);\r
+    if (mAcpiBootPerformanceTable != NULL) {\r
+      FreePages (mAcpiBootPerformanceTable, EFI_SIZE_TO_PAGES (BootPerformanceDataSize));\r
+    }\r
+    if (mAcpiS3PerformanceTable != NULL) {\r
+      FreePages (mAcpiS3PerformanceTable, EFI_SIZE_TO_PAGES (sizeof (S3_PERFORMANCE_TABLE)));\r
+    }\r
     mAcpiBootPerformanceTable = NULL;\r
     mAcpiS3PerformanceTable = NULL;\r
     return Status;\r
   }\r
-  \r
-  //\r
-  // Free temp Boot record, and update Boot Record to point to Basic Boot performance table.\r
-  //\r
-  if (mBootRecordBuffer != NULL) {\r
-    FreePool (mBootRecordBuffer);\r
-  }\r
-  mBootRecordBuffer  = (UINT8 *) mAcpiBootPerformanceTable;\r
-  mBootRecordSize    = mAcpiBootPerformanceTable->Header.Length;\r
-  mBootRecordMaxSize = mBootRecordSize + PcdGet32 (PcdExtFpdtBootRecordPadSize);\r
-  \r
   return EFI_SUCCESS;\r
 }\r
 \r
-/**\r
-  Notify function for event group EFI_EVENT_GROUP_READY_TO_BOOT. This is used to\r
-  install the Firmware Performance Data Table.\r
-\r
-  @param[in]  Event   The Event that is being processed.\r
-  @param[in]  Context The Event Context.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-FpdtReadyToBootEventNotify (\r
-  IN EFI_EVENT        Event,\r
-  IN VOID             *Context\r
-  )\r
-{\r
-  if (mAcpiBootPerformanceTable == NULL) {\r
-    //\r
-    // ACPI Firmware Performance Data Table not installed yet, install it now.\r
-    //\r
-    InstallFirmwarePerformanceDataTable ();\r
-  }\r
-}\r
-\r
-/**\r
-  Notify function for event group EFI_EVENT_LEGACY_BOOT_GUID. This is used to\r
-  record performance data for OsLoaderLoadImageStart in FPDT for legacy boot.\r
-\r
-  @param[in]  Event   The Event that is being processed.\r
-  @param[in]  Context The Event Context.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-FpdtLegacyBootEventNotify (\r
-  IN EFI_EVENT        Event,\r
-  IN VOID             *Context\r
-  )\r
-{\r
-  if (mAcpiBootPerformanceTable == NULL) {\r
-    //\r
-    // Firmware Performance Data Table not installed, do nothing.\r
-    //\r
-    return ;\r
-  }\r
-\r
-  //\r
-  // Update Firmware Basic Boot Performance Record for legacy boot.\r
-  //\r
-  mAcpiBootPerformanceTable->BasicBoot.OsLoaderLoadImageStart  = 0;\r
-  mAcpiBootPerformanceTable->BasicBoot.OsLoaderStartImageStart = GetTimeInNanoSecond (GetPerformanceCounter ());\r
-  mAcpiBootPerformanceTable->BasicBoot.ExitBootServicesEntry   = 0;\r
-  mAcpiBootPerformanceTable->BasicBoot.ExitBootServicesExit    = 0;\r
-\r
-  //\r
-  // Dump FPDT Boot Performance record.\r
-  //\r
-  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ResetEnd                = %ld\n", mAcpiBootPerformanceTable->BasicBoot.ResetEnd));\r
-  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - OsLoaderLoadImageStart  = 0\n"));\r
-  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - OsLoaderStartImageStart = %ld\n", mAcpiBootPerformanceTable->BasicBoot.OsLoaderStartImageStart));\r
-  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ExitBootServicesEntry   = 0\n"));\r
-  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ExitBootServicesExit    = 0\n"));\r
-}\r
-\r
-/**\r
-  Notify function for event EVT_SIGNAL_EXIT_BOOT_SERVICES. This is used to record\r
-  performance data for ExitBootServicesEntry in FPDT.\r
-\r
-  @param[in]  Event   The Event that is being processed.\r
-  @param[in]  Context The Event Context.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-FpdtExitBootServicesEventNotify (\r
-  IN EFI_EVENT        Event,\r
-  IN VOID             *Context\r
-  )\r
-{\r
-  if (mAcpiBootPerformanceTable == NULL) {\r
-    //\r
-    // Firmware Performance Data Table not installed, do nothing.\r
-    //\r
-    return ;\r
-  }\r
-\r
-  //\r
-  // Update Firmware Basic Boot Performance Record for UEFI boot.\r
-  //\r
-  mAcpiBootPerformanceTable->BasicBoot.ExitBootServicesEntry = GetTimeInNanoSecond (GetPerformanceCounter ());\r
-\r
-  //\r
-  // Dump FPDT Boot Performance record.\r
-  //\r
-  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ResetEnd                = %ld\n", mAcpiBootPerformanceTable->BasicBoot.ResetEnd));\r
-  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - OsLoaderLoadImageStart  = %ld\n", mAcpiBootPerformanceTable->BasicBoot.OsLoaderLoadImageStart));\r
-  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - OsLoaderStartImageStart = %ld\n", mAcpiBootPerformanceTable->BasicBoot.OsLoaderStartImageStart));\r
-  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ExitBootServicesEntry   = %ld\n", mAcpiBootPerformanceTable->BasicBoot.ExitBootServicesEntry));\r
-  //\r
-  // ExitBootServicesExit will be updated later, so don't dump it here.\r
-  //\r
-}\r
-\r
 /**\r
   Report status code listener of FPDT. This is used to collect performance data\r
   for OsLoaderLoadImageStart and OsLoaderStartImageStart in FPDT.\r
@@ -595,6 +431,13 @@ FpdtStatusCodeListenerDxe (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
+  if (Value == (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_HANDOFF_TO_NEXT)) {\r
+    //\r
+    // DxeCore ReportStatusCode Enable so that the capability can be supported.\r
+    //\r
+    mDxeCoreReportStatusCodeEnable = TRUE;\r
+  }\r
+\r
   Status = EFI_SUCCESS;\r
   if (Value == PcdGet32 (PcdProgressCodeOsLoaderLoad)) {\r
     //\r
@@ -621,6 +464,11 @@ FpdtStatusCodeListenerDxe (
     //\r
     mAcpiBootPerformanceTable->BasicBoot.OsLoaderStartImageStart = GetTimeInNanoSecond (GetPerformanceCounter ());\r
   } else if (Value == (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)) {\r
+    //\r
+    // Unregister boot time report status code listener.\r
+    //\r
+    mRscHandlerProtocol->Unregister (FpdtStatusCodeListenerDxe);\r
+\r
     //\r
     // Progress code for ExitBootServices.\r
     //\r
@@ -632,47 +480,42 @@ FpdtStatusCodeListenerDxe (
     // Update ExitBootServicesExit for UEFI boot.\r
     //\r
     mAcpiBootPerformanceTable->BasicBoot.ExitBootServicesExit = GetTimeInNanoSecond (GetPerformanceCounter ());\r
+  } else if (Value == (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_LEGACY_BOOT_EVENT)) {\r
+    if (mAcpiBootPerformanceTable == NULL) {\r
+      //\r
+      // Firmware Performance Data Table not installed, do nothing.\r
+      //\r
+      return Status;\r
+    }\r
 \r
     //\r
-    // Unregister boot time report status code listener.\r
+    // Update Firmware Basic Boot Performance Record for legacy boot.\r
     //\r
-    mRscHandlerProtocol->Unregister (FpdtStatusCodeListenerDxe);\r
-  } else if (Data != NULL && CompareGuid (&Data->Type, &gEfiFirmwarePerformanceGuid)) {\r
+    mAcpiBootPerformanceTable->BasicBoot.OsLoaderStartImageStart = GetTimeInNanoSecond (GetPerformanceCounter ());\r
+\r
     //\r
-    // Append one or more Boot records\r
+    // Dump FPDT Boot Performance record.\r
     //\r
+    DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ResetEnd                = %ld\n", mAcpiBootPerformanceTable->BasicBoot.ResetEnd));\r
+    DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - OsLoaderLoadImageStart  = 0\n"));\r
+    DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - OsLoaderStartImageStart = %ld\n", mAcpiBootPerformanceTable->BasicBoot.OsLoaderStartImageStart));\r
+    DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ExitBootServicesEntry   = 0\n"));\r
+    DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ExitBootServicesExit    = 0\n"));\r
+  } else if (Value == (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT)) {\r
     if (mAcpiBootPerformanceTable == NULL) {\r
       //\r
-      // Append Boot records before FPDT ACPI table is installed. \r
-      //\r
-      if (mBootRecordSize + Data->Size > mBootRecordMaxSize) {\r
-        mBootRecordBuffer = ReallocatePool (mBootRecordSize, mBootRecordSize + Data->Size + EXTENSION_RECORD_SIZE, mBootRecordBuffer);\r
-        ASSERT (mBootRecordBuffer != NULL);\r
-        mBootRecordMaxSize = mBootRecordSize + Data->Size + EXTENSION_RECORD_SIZE;\r
-      }\r
-      //\r
-      // Save boot record into the temp memory space.\r
-      //\r
-      CopyMem (mBootRecordBuffer + mBootRecordSize, Data + 1, Data->Size);\r
-      mBootRecordSize += Data->Size;\r
-    } else {\r
+      // ACPI Firmware Performance Data Table not installed yet, install it now.\r
       //\r
-      // Append Boot records after FPDT ACPI table is installed. \r
-      //\r
-      if (mBootRecordSize + Data->Size > mBootRecordMaxSize) {\r
-        //\r
-        // No enough space to save boot record.\r
-        //\r
-        Status = EFI_OUT_OF_RESOURCES;\r
-      } else {\r
-        //\r
-        // Save boot record into BootPerformance table\r
-        //\r
-        CopyMem (mBootRecordBuffer + mBootRecordSize, Data + 1, Data->Size);\r
-        mBootRecordSize += Data->Size;\r
-        mAcpiBootPerformanceTable->Header.Length = mBootRecordSize;\r
-      }\r
+      InstallFirmwarePerformanceDataTable ();\r
     }\r
+  } else if (Data != NULL && CompareGuid (&Data->Type, &gEdkiiFpdtExtendedFirmwarePerformanceGuid)) {\r
+    //\r
+    // Get the Boot performance table and then install it to ACPI table.\r
+    //\r
+    CopyMem (&mReceivedAcpiBootPerformanceTable, Data + 1, Data->Size);\r
+  } else if (Data != NULL && CompareGuid (&Data->Type, &gEfiFirmwarePerformanceGuid)) {\r
+    DEBUG ((DEBUG_ERROR, "FpdtStatusCodeListenerDxe: Performance data reported through gEfiFirmwarePerformanceGuid will not be collected by FirmwarePerformanceDataTableDxe\n"));\r
+    Status = EFI_UNSUPPORTED;\r
   } else {\r
     //\r
     // Ignore else progress code.\r
@@ -683,6 +526,54 @@ FpdtStatusCodeListenerDxe (
   return Status;\r
 }\r
 \r
+\r
+/**\r
+  Notify function for event EVT_SIGNAL_EXIT_BOOT_SERVICES. This is used to record\r
+  performance data for ExitBootServicesEntry in FPDT.\r
+\r
+  @param[in]  Event   The Event that is being processed.\r
+  @param[in]  Context The Event Context.\r
+\r
+**/\r
+VOID\r
+EFIAPI\r
+FpdtExitBootServicesEventNotify (\r
+  IN EFI_EVENT        Event,\r
+  IN VOID             *Context\r
+  )\r
+{\r
+  if (!mDxeCoreReportStatusCodeEnable) {\r
+    //\r
+    // When DxeCore Report Status Code is disabled,\r
+    // Unregister boot time report status code listener at ExitBootService Event.\r
+    //\r
+    mRscHandlerProtocol->Unregister (FpdtStatusCodeListenerDxe);\r
+  }\r
+\r
+  if (mAcpiBootPerformanceTable == NULL) {\r
+    //\r
+    // Firmware Performance Data Table not installed, do nothing.\r
+    //\r
+    return ;\r
+  }\r
+\r
+  //\r
+  // Update Firmware Basic Boot Performance Record for UEFI boot.\r
+  //\r
+  mAcpiBootPerformanceTable->BasicBoot.ExitBootServicesEntry = GetTimeInNanoSecond (GetPerformanceCounter ());\r
+\r
+  //\r
+  // Dump FPDT Boot Performance record.\r
+  //\r
+  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ResetEnd                = %ld\n", mAcpiBootPerformanceTable->BasicBoot.ResetEnd));\r
+  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - OsLoaderLoadImageStart  = %ld\n", mAcpiBootPerformanceTable->BasicBoot.OsLoaderLoadImageStart));\r
+  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - OsLoaderStartImageStart = %ld\n", mAcpiBootPerformanceTable->BasicBoot.OsLoaderStartImageStart));\r
+  DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ExitBootServicesEntry   = %ld\n", mAcpiBootPerformanceTable->BasicBoot.ExitBootServicesEntry));\r
+  //\r
+  // ExitBootServicesExit will be updated later, so don't dump it here.\r
+  //\r
+}\r
+\r
 /**\r
   The module Entry Point of the Firmware Performance Data Table DXE driver.\r
 \r
@@ -703,6 +594,19 @@ FirmwarePerformanceDxeEntryPoint (
   EFI_STATUS               Status;\r
   EFI_HOB_GUID_TYPE        *GuidHob;\r
   FIRMWARE_SEC_PERFORMANCE *Performance;\r
+  VOID                     *Registration;\r
+  UINT64                   OemTableId;\r
+\r
+  CopyMem (\r
+    mFirmwarePerformanceTableTemplate.Header.OemId,\r
+    PcdGetPtr (PcdAcpiDefaultOemId),\r
+    sizeof (mFirmwarePerformanceTableTemplate.Header.OemId)\r
+    );\r
+  OemTableId = PcdGet64 (PcdAcpiDefaultOemTableId);\r
+  CopyMem (&mFirmwarePerformanceTableTemplate.Header.OemTableId, &OemTableId, sizeof (UINT64));\r
+  mFirmwarePerformanceTableTemplate.Header.OemRevision      = PcdGet32 (PcdAcpiDefaultOemRevision);\r
+  mFirmwarePerformanceTableTemplate.Header.CreatorId        = PcdGet32 (PcdAcpiDefaultCreatorId);\r
+  mFirmwarePerformanceTableTemplate.Header.CreatorRevision  = PcdGet32 (PcdAcpiDefaultCreatorRevision);\r
 \r
   //\r
   // Get Report Status Code Handler Protocol.\r
@@ -729,32 +633,6 @@ FirmwarePerformanceDxeEntryPoint (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  //\r
-  // Create ready to boot event to install ACPI FPDT table.\r
-  //\r
-  Status = gBS->CreateEventEx (\r
-                  EVT_NOTIFY_SIGNAL,\r
-                  TPL_NOTIFY,\r
-                  FpdtReadyToBootEventNotify,\r
-                  NULL,\r
-                  &gEfiEventReadyToBootGuid,\r
-                  &mReadyToBootEvent\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  //\r
-  // Create legacy boot event to log OsLoaderStartImageStart for legacy boot.\r
-  //\r
-  Status = gBS->CreateEventEx (\r
-                  EVT_NOTIFY_SIGNAL,\r
-                  TPL_NOTIFY,\r
-                  FpdtLegacyBootEventNotify,\r
-                  NULL,\r
-                  &gEfiEventLegacyBootGuid,\r
-                  &mLegacyBootEvent\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
   //\r
   // Retrieve GUID HOB data that contains the ResetEnd.\r
   //\r
@@ -766,7 +644,33 @@ FirmwarePerformanceDxeEntryPoint (
     //\r
     // SEC Performance Data Hob not found, ResetEnd in ACPI FPDT table will be 0.\r
     //\r
-    DEBUG ((EFI_D_ERROR, "FPDT: WARNING: SEC Performance Data Hob not found, ResetEnd will be set to 0!\n"));\r
+    DEBUG ((DEBUG_WARN, "FPDT: WARNING: SEC Performance Data Hob not found, ResetEnd will be set to 0!\n"));\r
+  }\r
+\r
+  if (FeaturePcdGet (PcdFirmwarePerformanceDataTableS3Support)) {\r
+    //\r
+    // Register callback function upon VariableArchProtocol and LockBoxProtocol\r
+    // to allocate S3 performance table memory and save the pointer to LockBox.\r
+    //\r
+    EfiCreateProtocolNotifyEvent (\r
+      &gEfiVariableArchProtocolGuid,\r
+      TPL_CALLBACK,\r
+      FpdtAllocateS3PerformanceTableMemory,\r
+      NULL,\r
+      &Registration\r
+      );\r
+    EfiCreateProtocolNotifyEvent (\r
+      &gEfiLockBoxProtocolGuid,\r
+      TPL_CALLBACK,\r
+      FpdtAllocateS3PerformanceTableMemory,\r
+      NULL,\r
+      &Registration\r
+      );\r
+  } else {\r
+    //\r
+    // Exclude S3 Performance Table Pointer from FPDT table template.\r
+    //\r
+    mFirmwarePerformanceTableTemplate.Header.Length -= sizeof (EFI_ACPI_5_0_FPDT_S3_PERFORMANCE_TABLE_POINTER_RECORD);\r
   }\r
 \r
   return EFI_SUCCESS;\r