]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm
[mirror_edk2.git] / MdeModulePkg / Universal / Acpi / FirmwarePerformanceDataTableDxe / FirmwarePerformanceDxe.c
index 61a7704b37275a6c9de2be8e50f00a824a4d1073..aa2c984b9548399481c5f603bb5f587220895819 100644 (file)
@@ -5,7 +5,7 @@
   for Firmware Basic Boot Performance Record and other boot performance records,\r
   and install FPDT to ACPI table.\r
 \r
-  Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 2021, Intel Corporation. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -16,6 +16,7 @@
 #include <Protocol/AcpiTable.h>\r
 #include <Protocol/LockBox.h>\r
 #include <Protocol/Variable.h>\r
+#include <Protocol/VariablePolicy.h>\r
 \r
 #include <Guid/Acpi.h>\r
 #include <Guid/FirmwarePerformance.h>\r
 #include <Library/HobLib.h>\r
 #include <Library/LockBoxLib.h>\r
 #include <Library/UefiLib.h>\r
+#include <Library/VariablePolicyHelperLib.h>\r
+#include <Library/PerformanceLib.h>\r
 \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
+EFI_RSC_HANDLER_PROTOCOL  *mRscHandlerProtocol = NULL;\r
 \r
-BOOLEAN                     mLockBoxReady = FALSE;\r
-EFI_EVENT                   mReadyToBootEvent;\r
-EFI_EVENT                   mLegacyBootEvent;\r
-static EFI_EVENT            mExitBootServicesEvent;\r
-UINTN                       mFirmwarePerformanceTableTemplateKey  = 0;\r
-BOOLEAN                     mDxeCoreReportStatusCodeEnable = FALSE;\r
+BOOLEAN           mLockBoxReady = FALSE;\r
+EFI_EVENT         mReadyToBootEvent;\r
+EFI_EVENT         mLegacyBootEvent;\r
+static EFI_EVENT  mExitBootServicesEvent;\r
+UINTN             mFirmwarePerformanceTableTemplateKey = 0;\r
+BOOLEAN           mDxeCoreReportStatusCodeEnable       = FALSE;\r
 \r
-BOOT_PERFORMANCE_TABLE                      *mAcpiBootPerformanceTable = NULL;\r
-BOOT_PERFORMANCE_TABLE                      *mReceivedAcpiBootPerformanceTable = NULL;\r
-S3_PERFORMANCE_TABLE                        *mAcpiS3PerformanceTable   = NULL;\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
   {\r
     EFI_ACPI_5_0_FIRMWARE_PERFORMANCE_DATA_TABLE_SIGNATURE,\r
     sizeof (FIRMWARE_PERFORMANCE_TABLE),\r
-    EFI_ACPI_5_0_FIRMWARE_PERFORMANCE_DATA_TABLE_REVISION,    // Revision\r
-    0x00, // Checksum will be updated at runtime\r
+    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 EntryPoint.\r
     //\r
-    {0x00},     // OEM ID is a 6 bytes long field\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
@@ -68,7 +71,7 @@ FIRMWARE_PERFORMANCE_TABLE  mFirmwarePerformanceTableTemplate = {
   //\r
   {\r
     {\r
-      EFI_ACPI_5_0_FPDT_RECORD_TYPE_FIRMWARE_BASIC_BOOT_POINTER ,       // Type\r
+      EFI_ACPI_5_0_FPDT_RECORD_TYPE_FIRMWARE_BASIC_BOOT_POINTER       // Type\r
       sizeof (EFI_ACPI_5_0_FPDT_BOOT_PERFORMANCE_TABLE_POINTER_RECORD), // Length\r
       EFI_ACPI_5_0_FPDT_RECORD_REVISION_FIRMWARE_BASIC_BOOT_POINTER     // Revision\r
     },\r
@@ -89,7 +92,7 @@ FIRMWARE_PERFORMANCE_TABLE  mFirmwarePerformanceTableTemplate = {
   }\r
 };\r
 \r
-BOOT_PERFORMANCE_TABLE mBootPerformanceTableTemplate = {\r
+BOOT_PERFORMANCE_TABLE  mBootPerformanceTableTemplate = {\r
   {\r
     EFI_ACPI_5_0_FPDT_BOOT_PERFORMANCE_TABLE_SIGNATURE,\r
     sizeof (BOOT_PERFORMANCE_TABLE)\r
@@ -112,7 +115,7 @@ BOOT_PERFORMANCE_TABLE mBootPerformanceTableTemplate = {
   }\r
 };\r
 \r
-S3_PERFORMANCE_TABLE        mS3PerformanceTableTemplate = {\r
+S3_PERFORMANCE_TABLE  mS3PerformanceTableTemplate = {\r
   {\r
     EFI_ACPI_5_0_FPDT_S3_PERFORMANCE_TABLE_SIGNATURE,\r
     sizeof (S3_PERFORMANCE_TABLE)\r
@@ -153,11 +156,11 @@ S3_PERFORMANCE_TABLE        mS3PerformanceTableTemplate = {
 **/\r
 VOID\r
 FpdtAcpiTableChecksum (\r
-  IN UINT8      *Buffer,\r
-  IN UINTN      Size\r
+  IN UINT8  *Buffer,\r
+  IN UINTN  Size\r
   )\r
 {\r
-  UINTN ChecksumOffset;\r
+  UINTN  ChecksumOffset;\r
 \r
   ChecksumOffset = OFFSET_OF (EFI_ACPI_DESCRIPTION_HEADER, Checksum);\r
 \r
@@ -182,15 +185,15 @@ FpdtAcpiTableChecksum (
 VOID\r
 EFIAPI\r
 FpdtAllocateS3PerformanceTableMemory (\r
-  IN  EFI_EVENT                             Event,\r
-  IN  VOID                                  *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  VOID                          *Interface;\r
-  FIRMWARE_PERFORMANCE_VARIABLE PerformanceVariable;\r
-  UINTN                         Size;\r
-  EFI_PHYSICAL_ADDRESS          S3PerformanceTablePointer;\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
@@ -217,7 +220,7 @@ FpdtAllocateS3PerformanceTableMemory (
       // Try to allocate the same runtime buffer as last time boot.\r
       //\r
       ZeroMem (&PerformanceVariable, sizeof (PerformanceVariable));\r
-      Size = sizeof (PerformanceVariable);\r
+      Size   = sizeof (PerformanceVariable);\r
       Status = gRT->GetVariable (\r
                       EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,\r
                       &gEfiFirmwarePerformanceGuid,\r
@@ -233,19 +236,21 @@ FpdtAllocateS3PerformanceTableMemory (
                         &PerformanceVariable.S3PerformanceTablePointer\r
                         );\r
         if (!EFI_ERROR (Status)) {\r
-          mAcpiS3PerformanceTable = (S3_PERFORMANCE_TABLE *) (UINTN) PerformanceVariable.S3PerformanceTablePointer;\r
+          mAcpiS3PerformanceTable = (S3_PERFORMANCE_TABLE *)(UINTN)PerformanceVariable.S3PerformanceTablePointer;\r
         }\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
+        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
+\r
+      DEBUG ((DEBUG_INFO, "FPDT: ACPI S3 Performance Table address = 0x%x\n", mAcpiS3PerformanceTable));\r
       if (mAcpiS3PerformanceTable != NULL) {\r
         CopyMem (mAcpiS3PerformanceTable, &mS3PerformanceTableTemplate, sizeof (mS3PerformanceTableTemplate));\r
       }\r
@@ -257,12 +262,12 @@ FpdtAllocateS3PerformanceTableMemory (
     // 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
+    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
@@ -278,22 +283,31 @@ InstallFirmwarePerformanceDataTable (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_ACPI_TABLE_PROTOCOL       *AcpiTableProtocol;\r
-  UINTN                         BootPerformanceDataSize;\r
-  FIRMWARE_PERFORMANCE_VARIABLE PerformanceVariable;\r
-  UINTN                         Size;\r
+  EFI_STATUS                      Status;\r
+  EFI_ACPI_TABLE_PROTOCOL         *AcpiTableProtocol;\r
+  UINTN                           BootPerformanceDataSize;\r
+  FIRMWARE_PERFORMANCE_VARIABLE   PerformanceVariable;\r
+  UINTN                           Size;\r
+  EDKII_VARIABLE_POLICY_PROTOCOL  *VariablePolicyProtocol;\r
 \r
   //\r
   // Get AcpiTable Protocol.\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **) &AcpiTableProtocol);\r
+  Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **)&AcpiTableProtocol);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  //\r
+  // Get VariablePolicy Protocol.\r
+  //\r
+  Status = gBS->LocateProtocol (&gEdkiiVariablePolicyProtocolGuid, NULL, (VOID **)&VariablePolicyProtocol);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   if (mReceivedAcpiBootPerformanceTable != NULL) {\r
-    mAcpiBootPerformanceTable = mReceivedAcpiBootPerformanceTable;\r
+    mAcpiBootPerformanceTable                     = mReceivedAcpiBootPerformanceTable;\r
     mAcpiBootPerformanceTable->BasicBoot.ResetEnd = mBootPerformanceTableTemplate.BasicBoot.ResetEnd;\r
   } else {\r
     //\r
@@ -301,7 +315,7 @@ InstallFirmwarePerformanceDataTable (
     //\r
     BootPerformanceDataSize = sizeof (BOOT_PERFORMANCE_TABLE);\r
     ZeroMem (&PerformanceVariable, sizeof (PerformanceVariable));\r
-    Size = sizeof (PerformanceVariable);\r
+    Size   = sizeof (PerformanceVariable);\r
     Status = gRT->GetVariable (\r
                     EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,\r
                     &gEfiFirmwarePerformanceGuid,\r
@@ -317,62 +331,84 @@ InstallFirmwarePerformanceDataTable (
                       &PerformanceVariable.BootPerformanceTablePointer\r
                       );\r
       if (!EFI_ERROR (Status)) {\r
-         mAcpiBootPerformanceTable = (BOOT_PERFORMANCE_TABLE *) (UINTN) PerformanceVariable.BootPerformanceTablePointer;\r
+        mAcpiBootPerformanceTable = (BOOT_PERFORMANCE_TABLE *)(UINTN)PerformanceVariable.BootPerformanceTablePointer;\r
       }\r
     }\r
+\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
+      mAcpiBootPerformanceTable = (BOOT_PERFORMANCE_TABLE *)AllocatePeiAccessiblePages (\r
+                                                              EfiReservedMemoryType,\r
+                                                              EFI_SIZE_TO_PAGES (BootPerformanceDataSize)\r
+                                                              );\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
+\r
     //\r
     // Fill Basic Boot record to Boot Performance Table.\r
     //\r
     CopyMem (mAcpiBootPerformanceTable, &mBootPerformanceTableTemplate, sizeof (mBootPerformanceTableTemplate));\r
   }\r
-  BootPerformanceDataSize   = mAcpiBootPerformanceTable->Header.Length;\r
+\r
+  BootPerformanceDataSize = mAcpiBootPerformanceTable->Header.Length;\r
 \r
   //\r
   // Save Boot Performance Table address to Variable for use in S4 resume.\r
   //\r
-  PerformanceVariable.BootPerformanceTablePointer = (EFI_PHYSICAL_ADDRESS) (UINTN) mAcpiBootPerformanceTable;\r
+  PerformanceVariable.BootPerformanceTablePointer = (EFI_PHYSICAL_ADDRESS)(UINTN)mAcpiBootPerformanceTable;\r
   //\r
   // Update Boot Performance Table Pointer in template.\r
   //\r
-  mFirmwarePerformanceTableTemplate.BootPointerRecord.BootPerformanceTablePointer = (UINT64) (UINTN) mAcpiBootPerformanceTable;\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
+  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
+  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
   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
+         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
+  // Lock the variable which stores the Performance Table pointers.\r
+  //\r
+  Status = RegisterBasicVariablePolicy (\r
+             VariablePolicyProtocol,\r
+             &gEfiFirmwarePerformanceGuid,\r
+             EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,\r
+             VARIABLE_POLICY_NO_MIN_SIZE,\r
+             VARIABLE_POLICY_NO_MAX_SIZE,\r
+             VARIABLE_POLICY_NO_MUST_ATTR,\r
+             VARIABLE_POLICY_NO_CANT_ATTR,\r
+             VARIABLE_POLICY_TYPE_LOCK_NOW\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    DEBUG ((DEBUG_ERROR, "[FirmwarePerformanceDxe] Error when lock variable %s, Status = %r\n", EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME, Status));\r
+    ASSERT_EFI_ERROR (Status);\r
+  }\r
 \r
   //\r
   // Publish Firmware Performance Data Table.\r
   //\r
-  FpdtAcpiTableChecksum ((UINT8 *) &mFirmwarePerformanceTableTemplate, mFirmwarePerformanceTableTemplate.Header.Length);\r
+  FpdtAcpiTableChecksum ((UINT8 *)&mFirmwarePerformanceTableTemplate, mFirmwarePerformanceTableTemplate.Header.Length);\r
   Status = AcpiTableProtocol->InstallAcpiTable (\r
                                 AcpiTableProtocol,\r
                                 &mFirmwarePerformanceTableTemplate,\r
@@ -383,13 +419,16 @@ InstallFirmwarePerformanceDataTable (
     if (mAcpiBootPerformanceTable != NULL) {\r
       FreePages (mAcpiBootPerformanceTable, EFI_SIZE_TO_PAGES (BootPerformanceDataSize));\r
     }\r
+\r
     if (mAcpiS3PerformanceTable != NULL) {\r
       FreePages (mAcpiS3PerformanceTable, EFI_SIZE_TO_PAGES (sizeof (S3_PERFORMANCE_TABLE)));\r
     }\r
+\r
     mAcpiBootPerformanceTable = NULL;\r
-    mAcpiS3PerformanceTable = NULL;\r
+    mAcpiS3PerformanceTable   = NULL;\r
     return Status;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -415,11 +454,11 @@ InstallFirmwarePerformanceDataTable (
 EFI_STATUS\r
 EFIAPI\r
 FpdtStatusCodeListenerDxe (\r
-  IN EFI_STATUS_CODE_TYPE     CodeType,\r
-  IN EFI_STATUS_CODE_VALUE    Value,\r
-  IN UINT32                   Instance,\r
-  IN EFI_GUID                 *CallerId,\r
-  IN EFI_STATUS_CODE_DATA     *Data\r
+  IN EFI_STATUS_CODE_TYPE   CodeType,\r
+  IN EFI_STATUS_CODE_VALUE  Value,\r
+  IN UINT32                 Instance,\r
+  IN EFI_GUID               *CallerId,\r
+  IN EFI_STATUS_CODE_DATA   *Data\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -496,24 +535,18 @@ FpdtStatusCodeListenerDxe (
     //\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
-      // ACPI Firmware Performance Data Table not installed yet, install it now.\r
-      //\r
-      InstallFirmwarePerformanceDataTable ();\r
-    }\r
-  } else if (Data != NULL && CompareGuid (&Data->Type, &gEdkiiFpdtExtendedFirmwarePerformanceGuid)) {\r
+    DEBUG ((DEBUG_INFO, "FPDT: Boot Performance - ResetEnd                = %ld\n", mAcpiBootPerformanceTable->BasicBoot.ResetEnd));\r
+    DEBUG ((DEBUG_INFO, "FPDT: Boot Performance - OsLoaderLoadImageStart  = 0\n"));\r
+    DEBUG ((DEBUG_INFO, "FPDT: Boot Performance - OsLoaderStartImageStart = %ld\n", mAcpiBootPerformanceTable->BasicBoot.OsLoaderStartImageStart));\r
+    DEBUG ((DEBUG_INFO, "FPDT: Boot Performance - ExitBootServicesEntry   = 0\n"));\r
+    DEBUG ((DEBUG_INFO, "FPDT: Boot Performance - ExitBootServicesExit    = 0\n"));\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
+    InstallFirmwarePerformanceDataTable ();\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
@@ -526,6 +559,33 @@ FpdtStatusCodeListenerDxe (
   return Status;\r
 }\r
 \r
+/**\r
+  Notify function for event EndOfDxe.\r
+\r
+  This is used to install ACPI Firmware Performance Data Table for basic boot records.\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
+FpdtEndOfDxeEventNotify (\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
+  )\r
+{\r
+  //\r
+  // When performance is enabled, the FPDT will be installed when DxeCorePerformanceLib report the data to FimwarePerformanceDxe.\r
+  // This is used to install the FPDT for the basic boot recods when performance infrastructure is not enabled.\r
+  //\r
+  if ((PcdGet8 (PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0) {\r
+    return;\r
+  }\r
+\r
+  ASSERT (mReceivedAcpiBootPerformanceTable == NULL);\r
+  InstallFirmwarePerformanceDataTable ();\r
+}\r
 \r
 /**\r
   Notify function for event EVT_SIGNAL_EXIT_BOOT_SERVICES. This is used to record\r
@@ -538,8 +598,8 @@ FpdtStatusCodeListenerDxe (
 VOID\r
 EFIAPI\r
 FpdtExitBootServicesEventNotify (\r
-  IN EFI_EVENT        Event,\r
-  IN VOID             *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   if (!mDxeCoreReportStatusCodeEnable) {\r
@@ -554,7 +614,7 @@ FpdtExitBootServicesEventNotify (
     //\r
     // Firmware Performance Data Table not installed, do nothing.\r
     //\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -565,10 +625,10 @@ FpdtExitBootServicesEventNotify (
   //\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
+  DEBUG ((DEBUG_INFO, "FPDT: Boot Performance - ResetEnd                = %ld\n", mAcpiBootPerformanceTable->BasicBoot.ResetEnd));\r
+  DEBUG ((DEBUG_INFO, "FPDT: Boot Performance - OsLoaderLoadImageStart  = %ld\n", mAcpiBootPerformanceTable->BasicBoot.OsLoaderLoadImageStart));\r
+  DEBUG ((DEBUG_INFO, "FPDT: Boot Performance - OsLoaderStartImageStart = %ld\n", mAcpiBootPerformanceTable->BasicBoot.OsLoaderStartImageStart));\r
+  DEBUG ((DEBUG_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
@@ -587,15 +647,16 @@ FpdtExitBootServicesEventNotify (
 EFI_STATUS\r
 EFIAPI\r
 FirmwarePerformanceDxeEntryPoint (\r
-  IN EFI_HANDLE          ImageHandle,\r
-  IN EFI_SYSTEM_TABLE    *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  EFI_HOB_GUID_TYPE        *GuidHob;\r
-  FIRMWARE_SEC_PERFORMANCE *Performance;\r
-  VOID                     *Registration;\r
-  UINT64                   OemTableId;\r
+  EFI_STATUS                Status;\r
+  EFI_HOB_GUID_TYPE         *GuidHob;\r
+  FIRMWARE_SEC_PERFORMANCE  *Performance;\r
+  VOID                      *Registration;\r
+  UINT64                    OemTableId;\r
+  EFI_EVENT                 EndOfDxeEvent;\r
 \r
   CopyMem (\r
     mFirmwarePerformanceTableTemplate.Header.OemId,\r
@@ -604,14 +665,14 @@ FirmwarePerformanceDxeEntryPoint (
     );\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
+  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
   //\r
-  Status = gBS->LocateProtocol (&gEfiRscHandlerProtocolGuid, NULL, (VOID **) &mRscHandlerProtocol);\r
+  Status = gBS->LocateProtocol (&gEfiRscHandlerProtocolGuid, NULL, (VOID **)&mRscHandlerProtocol);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -620,6 +681,19 @@ FirmwarePerformanceDxeEntryPoint (
   Status = mRscHandlerProtocol->Register (FpdtStatusCodeListenerDxe, TPL_HIGH_LEVEL);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
+  //\r
+  // Register the notify function to install FPDT at EndOfDxe.\r
+  //\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_NOTIFY,\r
+                  FpdtEndOfDxeEventNotify,\r
+                  NULL,\r
+                  &gEfiEndOfDxeEventGroupGuid,\r
+                  &EndOfDxeEvent\r
+                  );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
   //\r
   // Register the notify function to update FPDT on ExitBootServices Event.\r
   //\r
@@ -638,7 +712,7 @@ FirmwarePerformanceDxeEntryPoint (
   //\r
   GuidHob = GetFirstGuidHob (&gEfiFirmwarePerformanceGuid);\r
   if (GuidHob != NULL) {\r
-    Performance = (FIRMWARE_SEC_PERFORMANCE *) GET_GUID_HOB_DATA (GuidHob);\r
+    Performance                                      = (FIRMWARE_SEC_PERFORMANCE *)GET_GUID_HOB_DATA (GuidHob);\r
     mBootPerformanceTableTemplate.BasicBoot.ResetEnd = Performance->ResetEnd;\r
   } else {\r
     //\r