[PATCH v3 6/8] MdeModulePkg/FirmwarePerfDxe:Enhance for new pref infrastructure

[Dandan Bi <dandan.bi@intel.com>]

V3:Add handling for the case when performance feature is not enabled.

V2:
Update FirmwarePerformanceDxe to receive the address
of performance records instead of records content.

1. Remove the macro EXTENSION_RECORD_SIZE, since the extension
size can be got through PcdExtFpdtBootRecordPadSize.

2. Hook EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT to install ACPI table

3. Copy SMM record accord to the allocated size

4. Receive Boot performance table address instead of
 contents which are reported DxeCorePerformanceLib.

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>
---
 .../FirmwarePerformanceDxe.c                       | 294 ++++-----------------
 .../FirmwarePerformanceDxe.inf                     |   4 +-
 2 files changed, 51 insertions(+), 247 deletions(-)

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
index b004cac..51a72f0 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
@@ -3,11 +3,11 @@
 
   This module register report status code listener to collect performance data
   for Firmware Basic Boot Performance Record and other boot performance records, 
   and install FPDT to ACPI table.
 
-  Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
   http://opensource.org/licenses/bsd-license.php
 
@@ -18,19 +18,17 @@
 
 #include <PiDxe.h>
 
 #include <Protocol/ReportStatusCodeHandler.h>
 #include <Protocol/AcpiTable.h>
-#include <Protocol/SmmCommunication.h>
 #include <Protocol/LockBox.h>
 #include <Protocol/Variable.h>
 
 #include <Guid/Acpi.h>
 #include <Guid/FirmwarePerformance.h>
 #include <Guid/EventGroup.h>
 #include <Guid/EventLegacyBios.h>
-#include <Guid/PiSmmCommunicationRegionTable.h>
 
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
@@ -40,26 +38,23 @@
 #include <Library/PcdLib.h>
 #include <Library/HobLib.h>
 #include <Library/LockBoxLib.h>
 #include <Library/UefiLib.h>
 
-#define EXTENSION_RECORD_SIZE     0x10000
-#define SMM_BOOT_RECORD_COMM_SIZE OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data) + sizeof(SMM_BOOT_RECORD_COMMUNICATE)
+#define SMM_BOOT_RECORD_COMM_SIZE (OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data) + sizeof(SMM_BOOT_RECORD_COMMUNICATE))
 
 EFI_RSC_HANDLER_PROTOCOL    *mRscHandlerProtocol = NULL;
 
 BOOLEAN                     mLockBoxReady = FALSE;
 EFI_EVENT                   mReadyToBootEvent;
 EFI_EVENT                   mLegacyBootEvent;
 EFI_EVENT                   mExitBootServicesEvent;
 UINTN                       mFirmwarePerformanceTableTemplateKey  = 0;
-UINT32                      mBootRecordSize = 0;
-UINT32                      mBootRecordMaxSize = 0;
-UINT8                       *mBootRecordBuffer = NULL;
 BOOLEAN                     mDxeCoreReportStatusCodeEnable = FALSE;
 
 BOOT_PERFORMANCE_TABLE                      *mAcpiBootPerformanceTable = NULL;
+BOOT_PERFORMANCE_TABLE                      *mReceivedAcpiBootPerformanceTable = NULL;
 S3_PERFORMANCE_TABLE                        *mAcpiS3PerformanceTable   = NULL;
 
 FIRMWARE_PERFORMANCE_TABLE  mFirmwarePerformanceTableTemplate = {
   {
     EFI_ACPI_5_0_FIRMWARE_PERFORMANCE_DATA_TABLE_SIGNATURE,
@@ -327,186 +322,66 @@ InstallFirmwarePerformanceDataTable (
   VOID
   )
 {
   EFI_STATUS                    Status;
   EFI_ACPI_TABLE_PROTOCOL       *AcpiTableProtocol;
-  UINTN                         Size;
-  UINT8                         *SmmBootRecordCommBuffer;
-  EFI_SMM_COMMUNICATE_HEADER    *SmmCommBufferHeader;
-  SMM_BOOT_RECORD_COMMUNICATE   *SmmCommData;
-  UINTN                         CommSize;
   UINTN                         BootPerformanceDataSize;
-  UINT8                         *BootPerformanceData; 
-  EFI_SMM_COMMUNICATION_PROTOCOL  *Communication;
   FIRMWARE_PERFORMANCE_VARIABLE PerformanceVariable;
-  EDKII_PI_SMM_COMMUNICATION_REGION_TABLE *SmmCommRegionTable;
-  EFI_MEMORY_DESCRIPTOR         *SmmCommMemRegion;
-  UINTN                         Index;
-  VOID                          *SmmBootRecordData;
-  UINTN                         SmmBootRecordDataSize;
-  UINTN                         ReservedMemSize;
+  UINTN                         Size;
 
   //
   // Get AcpiTable Protocol.
   //
   Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **) &AcpiTableProtocol);
   if (EFI_ERROR (Status)) {
     return Status;
   }
 
-  //
-  // Collect boot records from SMM drivers.
-  //
-  SmmBootRecordCommBuffer = NULL;
-  SmmCommData             = NULL;
-  SmmBootRecordData       = NULL;
-  SmmBootRecordDataSize   = 0;
-  ReservedMemSize         = 0;
-  Status = gBS->LocateProtocol (&gEfiSmmCommunicationProtocolGuid, NULL, (VOID **) &Communication);
-  if (!EFI_ERROR (Status)) {
-    //
-    // Initialize communicate buffer 
-    // Get the prepared Reserved Memory Range
+  if (mReceivedAcpiBootPerformanceTable != NULL) {
+    mAcpiBootPerformanceTable = mReceivedAcpiBootPerformanceTable;
+    mAcpiBootPerformanceTable->BasicBoot.ResetEnd = mBootPerformanceTableTemplate.BasicBoot.ResetEnd;
+  } else {
     //
-    Status = EfiGetSystemConfigurationTable (
-              &gEdkiiPiSmmCommunicationRegionTableGuid, 
-              (VOID **) &SmmCommRegionTable
-              );
+    // Try to allocate the same runtime buffer as last time boot.
+    //
+    BootPerformanceDataSize = sizeof (BOOT_PERFORMANCE_TABLE);
+    ZeroMem (&PerformanceVariable, sizeof (PerformanceVariable));
+    Size = sizeof (PerformanceVariable);
+    Status = gRT->GetVariable (
+                    EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,
+                    &gEfiFirmwarePerformanceGuid,
+                    NULL,
+                    &Size,
+                    &PerformanceVariable
+                    );
     if (!EFI_ERROR (Status)) {
-      ASSERT (SmmCommRegionTable != NULL);
-      SmmCommMemRegion = (EFI_MEMORY_DESCRIPTOR *) (SmmCommRegionTable + 1);
-      for (Index = 0; Index < SmmCommRegionTable->NumberOfEntries; Index ++) {
-        if (SmmCommMemRegion->Type == EfiConventionalMemory) {
-          break;
-        }
-        SmmCommMemRegion = (EFI_MEMORY_DESCRIPTOR *) ((UINT8 *) SmmCommMemRegion + SmmCommRegionTable->DescriptorSize);
+      Status = gBS->AllocatePages (
+                      AllocateAddress,
+                      EfiReservedMemoryType,
+                      EFI_SIZE_TO_PAGES (BootPerformanceDataSize),
+                      &PerformanceVariable.BootPerformanceTablePointer
+                      );
+      if (!EFI_ERROR (Status)) {
+         mAcpiBootPerformanceTable = (BOOT_PERFORMANCE_TABLE *) (UINTN) PerformanceVariable.BootPerformanceTablePointer;
       }
-      ASSERT (Index < SmmCommRegionTable->NumberOfEntries);
-      ASSERT (SmmCommMemRegion->PhysicalStart > 0);
-      ASSERT (SmmCommMemRegion->NumberOfPages > 0);
-      ReservedMemSize = (UINTN) SmmCommMemRegion->NumberOfPages * EFI_PAGE_SIZE;
-    
+    }
+    if (mAcpiBootPerformanceTable == NULL) {
       //
-      // Check enough reserved memory space
+      // Fail to allocate at specified address, continue to allocate at any address.
       //
-      if (ReservedMemSize > SMM_BOOT_RECORD_COMM_SIZE) {
-        SmmBootRecordCommBuffer = (VOID *) (UINTN) SmmCommMemRegion->PhysicalStart;
-        SmmCommBufferHeader = (EFI_SMM_COMMUNICATE_HEADER*)SmmBootRecordCommBuffer;
-        SmmCommData = (SMM_BOOT_RECORD_COMMUNICATE*)SmmCommBufferHeader->Data;
-        ZeroMem((UINT8*)SmmCommData, sizeof(SMM_BOOT_RECORD_COMMUNICATE));
-    
-        CopyGuid (&SmmCommBufferHeader->HeaderGuid, &gEfiFirmwarePerformanceGuid);
-        SmmCommBufferHeader->MessageLength = sizeof(SMM_BOOT_RECORD_COMMUNICATE);
-        CommSize = SMM_BOOT_RECORD_COMM_SIZE;
-      
-        //
-        // Get the size of boot records.
-        //
-        SmmCommData->Function       = SMM_FPDT_FUNCTION_GET_BOOT_RECORD_SIZE;
-        SmmCommData->BootRecordData = NULL;
-        Status = Communication->Communicate (Communication, SmmBootRecordCommBuffer, &CommSize);
-        ASSERT_EFI_ERROR (Status);
-      
-        if (!EFI_ERROR (SmmCommData->ReturnStatus) && SmmCommData->BootRecordSize != 0) {
-          //
-          // Get all boot records
-          //
-          SmmCommData->Function       = SMM_FPDT_FUNCTION_GET_BOOT_RECORD_DATA_BY_OFFSET;
-          SmmBootRecordDataSize       = SmmCommData->BootRecordSize;
-          SmmBootRecordData           = AllocateZeroPool(SmmBootRecordDataSize);
-          ASSERT (SmmBootRecordData  != NULL);
-          SmmCommData->BootRecordOffset = 0;
-          SmmCommData->BootRecordData   = (VOID *) ((UINTN) SmmCommMemRegion->PhysicalStart + SMM_BOOT_RECORD_COMM_SIZE);
-          SmmCommData->BootRecordSize   = ReservedMemSize - SMM_BOOT_RECORD_COMM_SIZE;
-          while (SmmCommData->BootRecordOffset < SmmBootRecordDataSize) {
-            Status = Communication->Communicate (Communication, SmmBootRecordCommBuffer, &CommSize);
-            ASSERT_EFI_ERROR (Status);
-            ASSERT_EFI_ERROR(SmmCommData->ReturnStatus);
-            CopyMem ((UINT8 *) SmmBootRecordData + SmmCommData->BootRecordOffset, SmmCommData->BootRecordData, SmmCommData->BootRecordSize);
-            SmmCommData->BootRecordOffset = SmmCommData->BootRecordOffset + SmmCommData->BootRecordSize;
-          }
-        }
-      }
-    }
-  }
-
-  //
-  // Prepare memory for Boot Performance table.
-  // Boot Performance table includes BasicBoot record, and one or more appended Boot Records. 
-  //
-  BootPerformanceDataSize = sizeof (BOOT_PERFORMANCE_TABLE) + mBootRecordSize + PcdGet32 (PcdExtFpdtBootRecordPadSize);
-  if (SmmCommData != NULL) {
-    BootPerformanceDataSize += SmmBootRecordDataSize;
-  }
-
-  //
-  // Try to allocate the same runtime buffer as last time boot.
-  //
-  ZeroMem (&PerformanceVariable, sizeof (PerformanceVariable));
-  Size = sizeof (PerformanceVariable);
-  Status = gRT->GetVariable (
-                  EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,
-                  &gEfiFirmwarePerformanceGuid,
-                  NULL,
-                  &Size,
-                  &PerformanceVariable
-                  );
-  if (!EFI_ERROR (Status)) {
-    Status = gBS->AllocatePages (
-                    AllocateAddress,
-                    EfiReservedMemoryType,
-                    EFI_SIZE_TO_PAGES (BootPerformanceDataSize),
-                    &PerformanceVariable.BootPerformanceTablePointer
-                    );
-    if (!EFI_ERROR (Status)) {
-      mAcpiBootPerformanceTable = (BOOT_PERFORMANCE_TABLE *) (UINTN) PerformanceVariable.BootPerformanceTablePointer;
+      mAcpiBootPerformanceTable = (BOOT_PERFORMANCE_TABLE *) FpdtAllocateReservedMemoryBelow4G (BootPerformanceDataSize);
     }
-  }
-
-  if (mAcpiBootPerformanceTable == NULL) {
-    //
-    // Fail to allocate at specified address, continue to allocate at any address.
-    //
-    mAcpiBootPerformanceTable = (BOOT_PERFORMANCE_TABLE *) FpdtAllocateReservedMemoryBelow4G (BootPerformanceDataSize);
-  }
-  DEBUG ((EFI_D_INFO, "FPDT: ACPI Boot Performance Table address = 0x%x\n", mAcpiBootPerformanceTable));
-
-  if (mAcpiBootPerformanceTable == NULL) {
-    if (SmmCommData != NULL && SmmBootRecordData != NULL) {
-      FreePool (SmmBootRecordData);
-    }
-    if (mAcpiS3PerformanceTable != NULL) {
-      FreePages (mAcpiS3PerformanceTable, EFI_SIZE_TO_PAGES (sizeof (S3_PERFORMANCE_TABLE)));
-      mAcpiS3PerformanceTable = NULL;
+    DEBUG ((DEBUG_INFO, "FPDT: ACPI Boot Performance Table address = 0x%x\n", mAcpiBootPerformanceTable));
+    if (mAcpiBootPerformanceTable == NULL) {
+      return EFI_OUT_OF_RESOURCES;
     }
-    return EFI_OUT_OF_RESOURCES;
-  }
-
-  //
-  // Prepare Boot Performance Table.
-  //
-  BootPerformanceData = (UINT8 *) mAcpiBootPerformanceTable;
-  //
-  // Fill Basic Boot record to Boot Performance Table.
-  //
-  CopyMem (mAcpiBootPerformanceTable, &mBootPerformanceTableTemplate, sizeof (mBootPerformanceTableTemplate));
-  BootPerformanceData = BootPerformanceData + mAcpiBootPerformanceTable->Header.Length;
-  //
-  // Fill Boot records from boot drivers.
-  //
-  CopyMem (BootPerformanceData, mBootRecordBuffer, mBootRecordSize);
-  mAcpiBootPerformanceTable->Header.Length += mBootRecordSize;
-  BootPerformanceData = BootPerformanceData + mBootRecordSize;
-  if (SmmCommData != NULL && SmmBootRecordData != NULL) {
     //
-    // Fill Boot records from SMM drivers.
+    // Fill Basic Boot record to Boot Performance Table.
     //
-    CopyMem (BootPerformanceData, SmmBootRecordData, SmmBootRecordDataSize);
-    FreePool (SmmBootRecordData);
-    mAcpiBootPerformanceTable->Header.Length = (UINT32) (mAcpiBootPerformanceTable->Header.Length + SmmBootRecordDataSize);
-    BootPerformanceData = BootPerformanceData + SmmBootRecordDataSize;
+    CopyMem (mAcpiBootPerformanceTable, &mBootPerformanceTableTemplate, sizeof (mBootPerformanceTableTemplate));
   }
+  BootPerformanceDataSize   = mAcpiBootPerformanceTable->Header.Length;
 
   //
   // Save Boot Performance Table address to Variable for use in S4 resume.
   //
   PerformanceVariable.BootPerformanceTablePointer = (EFI_PHYSICAL_ADDRESS) (UINTN) mAcpiBootPerformanceTable;
@@ -523,11 +398,11 @@ InstallFirmwarePerformanceDataTable (
   // Update S3 Performance Table Pointer in template.
   //
   mFirmwarePerformanceTableTemplate.S3PointerRecord.S3PerformanceTablePointer = (UINT64) (UINTN) mAcpiS3PerformanceTable;
   //
   // Save Runtime Performance Table pointers to Variable.
-  // Don't check SetVariable return status. It doesn't impact FPDT table generation. 
+  // Don't check SetVariable return status. It doesn't impact FPDT table generation.
   //
   gRT->SetVariable (
         EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,
         &gEfiFirmwarePerformanceGuid,
         EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
@@ -544,56 +419,24 @@ InstallFirmwarePerformanceDataTable (
                                 &mFirmwarePerformanceTableTemplate,
                                 mFirmwarePerformanceTableTemplate.Header.Length,
                                 &mFirmwarePerformanceTableTemplateKey
                                 );
   if (EFI_ERROR (Status)) {
-    FreePages (mAcpiBootPerformanceTable, EFI_SIZE_TO_PAGES (BootPerformanceDataSize));
+    if (mAcpiBootPerformanceTable != NULL) {
+      FreePages (mAcpiBootPerformanceTable, EFI_SIZE_TO_PAGES (BootPerformanceDataSize));
+    }
     if (mAcpiS3PerformanceTable != NULL) {
       FreePages (mAcpiS3PerformanceTable, EFI_SIZE_TO_PAGES (sizeof (S3_PERFORMANCE_TABLE)));
     }
     mAcpiBootPerformanceTable = NULL;
     mAcpiS3PerformanceTable = NULL;
     return Status;
   }
-  
-  //
-  // Free temp Boot record, and update Boot Record to point to Basic Boot performance table.
-  //
-  if (mBootRecordBuffer != NULL) {
-    FreePool (mBootRecordBuffer);
-  }
-  mBootRecordBuffer  = (UINT8 *) mAcpiBootPerformanceTable;
-  mBootRecordSize    = mAcpiBootPerformanceTable->Header.Length;
-  mBootRecordMaxSize = mBootRecordSize + PcdGet32 (PcdExtFpdtBootRecordPadSize);
-  
   return EFI_SUCCESS;
 }
 
 /**
-  Notify function for event group EFI_EVENT_GROUP_READY_TO_BOOT. This is used to
-  install the Firmware Performance Data Table.
-
-  @param[in]  Event   The Event that is being processed.
-  @param[in]  Context The Event Context.
-
-**/
-VOID
-EFIAPI
-FpdtReadyToBootEventNotify (
-  IN EFI_EVENT        Event,
-  IN VOID             *Context
-  )
-{
-  if (mAcpiBootPerformanceTable == NULL) {
-    //
-    // ACPI Firmware Performance Data Table not installed yet, install it now.
-    //
-    InstallFirmwarePerformanceDataTable ();
-  }
-}
-
-/**
   Report status code listener of FPDT. This is used to collect performance data
   for OsLoaderLoadImageStart and OsLoaderStartImageStart in FPDT.
 
   @param[in]  CodeType            Indicates the type of status code being reported.
   @param[in]  Value               Describes the current status of a hardware or software entity.
@@ -697,46 +540,22 @@ FpdtStatusCodeListenerDxe (
     DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ResetEnd                = %ld\n", mAcpiBootPerformanceTable->BasicBoot.ResetEnd));
     DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - OsLoaderLoadImageStart  = 0\n"));
     DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - OsLoaderStartImageStart = %ld\n", mAcpiBootPerformanceTable->BasicBoot.OsLoaderStartImageStart));
     DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ExitBootServicesEntry   = 0\n"));
     DEBUG ((EFI_D_INFO, "FPDT: Boot Performance - ExitBootServicesExit    = 0\n"));
-  } else if (Data != NULL && CompareGuid (&Data->Type, &gEfiFirmwarePerformanceGuid)) {
-    //
-    // Append one or more Boot records
-    //
+  } else if (Value == (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT)) {
     if (mAcpiBootPerformanceTable == NULL) {
       //
-      // Append Boot records before FPDT ACPI table is installed. 
-      //
-      if (mBootRecordSize + Data->Size > mBootRecordMaxSize) {
-        mBootRecordBuffer = ReallocatePool (mBootRecordSize, mBootRecordSize + Data->Size + EXTENSION_RECORD_SIZE, mBootRecordBuffer);
-        ASSERT (mBootRecordBuffer != NULL);
-        mBootRecordMaxSize = mBootRecordSize + Data->Size + EXTENSION_RECORD_SIZE;
-      }
-      //
-      // Save boot record into the temp memory space.
-      //
-      CopyMem (mBootRecordBuffer + mBootRecordSize, Data + 1, Data->Size);
-      mBootRecordSize += Data->Size;
-    } else {
+      // ACPI Firmware Performance Data Table not installed yet, install it now.
       //
-      // Append Boot records after FPDT ACPI table is installed. 
-      //
-      if (mBootRecordSize + Data->Size > mBootRecordMaxSize) {
-        //
-        // No enough space to save boot record.
-        //
-        Status = EFI_OUT_OF_RESOURCES;
-      } else {
-        //
-        // Save boot record into BootPerformance table
-        //
-        CopyMem (mBootRecordBuffer + mBootRecordSize, Data + 1, Data->Size);
-        mBootRecordSize += Data->Size;
-        mAcpiBootPerformanceTable->Header.Length = mBootRecordSize;
-      }
+      InstallFirmwarePerformanceDataTable ();
     }
+  } else if (Data != NULL && CompareGuid (&Data->Type, &gEfiFirmwarePerformanceGuid)) {
+    //
+    // Get the Boot performance table and then install it to ACPI table.
+    //
+    CopyMem (&mReceivedAcpiBootPerformanceTable, Data + 1, Data->Size);
   } else {
     //
     // Ignore else progress code.
     //
     Status = EFI_UNSUPPORTED;
@@ -851,23 +670,10 @@ FirmwarePerformanceDxeEntryPoint (
                   &mExitBootServicesEvent
                   );
   ASSERT_EFI_ERROR (Status);
 
   //
-  // Create ready to boot event to install ACPI FPDT table.
-  //
-  Status = gBS->CreateEventEx (
-                  EVT_NOTIFY_SIGNAL,
-                  TPL_NOTIFY,
-                  FpdtReadyToBootEventNotify,
-                  NULL,
-                  &gEfiEventReadyToBootGuid,
-                  &mReadyToBootEvent
-                  );
-  ASSERT_EFI_ERROR (Status);
-
-  //
   // Retrieve GUID HOB data that contains the ResetEnd.
   //
   GuidHob = GetFirstGuidHob (&gEfiFirmwarePerformanceGuid);
   if (GuidHob != NULL) {
     Performance = (FIRMWARE_SEC_PERFORMANCE *) GET_GUID_HOB_DATA (GuidHob);
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
index 49d8420..d65e04e 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
@@ -3,11 +3,11 @@
 #
 #  This module registers report status code listener to collect performance data
 #  for Firmware Basic Boot Performance Record and other boot performance records, 
 #  and install FPDT to ACPI table.
 #
-#  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution.  The full text of the license may be found at
 #  http://opensource.org/licenses/bsd-license.php
 #  
@@ -53,11 +53,10 @@
   UefiLib
 
 [Protocols]
   gEfiAcpiTableProtocolGuid                     ## CONSUMES
   gEfiRscHandlerProtocolGuid                    ## CONSUMES
-  gEfiSmmCommunicationProtocolGuid              ## SOMETIMES_CONSUMES
   gEfiVariableArchProtocolGuid                  ## CONSUMES
   gEfiLockBoxProtocolGuid                       ## CONSUMES
 
 [Guids]
   gEfiEventExitBootServicesGuid                 ## CONSUMES             ## Event
@@ -68,11 +67,10 @@
   ## PRODUCES             ## Variable:L"FirmwarePerformance"
   ## SOMETIMES_CONSUMES ## UNDEFINED # Used to do smm communication
   ## SOMETIMES_CONSUMES ## UNDEFINED # StatusCode Data
   gEfiFirmwarePerformanceGuid
   gFirmwarePerformanceS3PointerGuid             ## PRODUCES ## UNDEFINED # SaveLockBox
-  gEdkiiPiSmmCommunicationRegionTableGuid       ## SOMETIMES_CONSUMES    ## SystemTable
 
 [Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad    ## CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart   ## CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdExtFpdtBootRecordPadSize    ## CONSUMES
-- 
1.9.5.msysgit.1