MdeModulePkg/Core/Pei: Install MigrateTempRamPpi

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4716

Migrate FSP-T/M binary from temporary RAM to permanent RAM before NEM
tear down. Tcg module will use permanent address of FSP-T/M for
measurement. In MdeModulePkg, PeiCore installs mMigrateTempRamPpi if
PcdMigrateTemporaryRamFirmwareVolumes is True before NEM tear down and
after permanent memory ready.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Duggapu Chinni B <chinni.b.duggapu@intel.com>
Cc: Chen Gang C <gang.c.chen@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>

Signed-off-by: Zhihao Li <zhihao.li@intel.com>

6 files changed, 41 insertions, 5 deletions

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index 46b6c23..8df0c2d 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -1,7 +1,7 @@
 /** @file

   Definition of Pei Core Structures and Services

 

-Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2024, Intel Corporation. All rights reserved.<BR>

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -26,6 +26,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Ppi/TemporaryRamDone.h>

 #include <Ppi/SecHobData.h>

 #include <Ppi/PeiCoreFvLocation.h>

+#include <Ppi/MigrateTempRam.h>

 #include <Library/DebugLib.h>

 #include <Library/PeiCoreEntryPoint.h>

 #include <Library/BaseLib.h>

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 893bdc0..4e545dd 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -6,7 +6,7 @@
 # 2) Dispatch PEIM from discovered FV.

 # 3) Handoff control to DxeIpl to load DXE core and enter DXE phase.

 #

-# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2024, Intel Corporation. All rights reserved.<BR>

 #

 #  SPDX-License-Identifier: BSD-2-Clause-Patent

 #

@@ -101,6 +101,7 @@
   gEfiPeiReset2PpiGuid                          ## SOMETIMES_CONSUMES

   gEfiSecHobDataPpiGuid                         ## SOMETIMES_CONSUMES

   gEfiPeiCoreFvLocationPpiGuid                  ## SOMETIMES_CONSUMES

+  gEdkiiPeiMigrateTempRamPpiGuid                ## PRODUCES

 

 [Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize                  ## CONSUMES

diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index bf1719d..0e3d9a8 100644
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -1,7 +1,7 @@
 /** @file

   Pei Core Main Entry Point

 

-Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2024, Intel Corporation. All rights reserved.<BR>

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -13,6 +13,11 @@ EFI_PEI_PPI_DESCRIPTOR  mMemoryDiscoveredPpi = {
   &gEfiPeiMemoryDiscoveredPpiGuid,

   NULL

 };

+EFI_PEI_PPI_DESCRIPTOR  mMigrateTempRamPpi = {

+  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

+  &gEdkiiPeiMigrateTempRamPpiGuid,

+  NULL

+};

 

 ///

 /// Pei service instance

@@ -449,6 +454,9 @@ PeiCore (
       //

       EvacuateTempRam (&PrivateData, SecCoreData);

 

+      Status = PeiServicesInstallPpi (&mMigrateTempRamPpi);

+      ASSERT_EFI_ERROR (Status);

+

       DEBUG ((DEBUG_VERBOSE, "PPI lists after temporary RAM evacuation:\n"));

       DumpPpiList (&PrivateData);

     }

diff --git a/MdeModulePkg/Include/Guid/MigratedFvInfo.h b/MdeModulePkg/Include/Guid/MigratedFvInfo.h
index 1c8b0df..255e278 100644
--- a/MdeModulePkg/Include/Guid/MigratedFvInfo.h
+++ b/MdeModulePkg/Include/Guid/MigratedFvInfo.h
@@ -1,7 +1,7 @@
 /** @file

   Migrated FV information

 

-Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2020 - 2024, Intel Corporation. All rights reserved.<BR>

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -50,7 +50,7 @@ typedef struct {
 

 typedef struct {

   UINT32    FvOrgBase;         // original FV address

-  UINT32    FvNewBase;         // new FV address

+  UINT32    FvNewBase;         // new FV address, 0 means rebased data is not copied

   UINT32    FvDataBase;        // original FV data, 0 means raw data is not copied

   UINT32    FvLength;          // Fv Length

 } EDKII_MIGRATED_FV_INFO;

diff --git a/MdeModulePkg/Include/Ppi/MigrateTempRam.h b/MdeModulePkg/Include/Ppi/MigrateTempRam.h
new file mode 100644
index 0000000..9bbb55d
--- /dev/null
+++ b/MdeModulePkg/Include/Ppi/MigrateTempRam.h
@@ -0,0 +1,23 @@
+/** @file

+  This file declares Migrate Temporary Memory PPI.

+

+  This PPI is published by the PEI Foundation when temporary RAM needs to evacuate.

+  Its purpose is to be used as a signal for other PEIMs who can register for a

+  notification on its installation.

+

+  Copyright (c) 2024, Intel Corporation. All rights reserved.<BR>

+  SPDX-License-Identifier: BSD-2-Clause-Patent

+

+**/

+

+#ifndef PEI_MIGRATE_TEMP_RAM_PPI_H_

+#define PEI_MIGRATE_TEMP_RAM_PPI_H_

+

+#define EFI_PEI_MIGRATE_TEMP_RAM_PPI_GUID \

+  { \

+    0xc79dc53b, 0xafcd, 0x4a6a, {0xad, 0x94, 0xa7, 0x6a, 0x3f, 0xa9, 0xe9, 0xc2 } \

+  }

+

+extern EFI_GUID  gEdkiiPeiMigrateTempRamPpiGuid;

+

+#endif

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index fdd1d48..6148025 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -557,6 +557,9 @@
   ## Include/Ppi/MemoryAttribute.h

   gEdkiiMemoryAttributePpiGuid              = { 0x1be840de, 0x2d92, 0x41ec, { 0xb6, 0xd3, 0x19, 0x64, 0x13, 0x50, 0x51, 0xfb } }

 

+  ## Include/Ppi/MigrateTempRam.h

+  gEdkiiPeiMigrateTempRamPpiGuid            = { 0xc79dc53b, 0xafcd, 0x4a6a, { 0xad, 0x94, 0xa7, 0x6a, 0x3f, 0xa9, 0xe9, 0xc2 } }

+

 [Protocols]

   ## Load File protocol provides capability to load and unload EFI image into memory and execute it.

   #  Include/Protocol/LoadPe32Image.h