From 8e0e40ed3d4b6566a618d60d35a69fb13da39a20 Mon Sep 17 00:00:00 2001
From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 3 Dec 2009 02:48:05 +0000
Subject: [PATCH] After PeiCore is shadowed into permanent memory, the pointers
 to build-in Ffs2 FvPpi should be also fixed up to be pointed to the one in
 permanent memory.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9508 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c |  2 +
 MdeModulePkg/Core/Pei/FwVol/FwVol.c           | 48 +++++++++++++++++++
 MdeModulePkg/Core/Pei/PeiMain.h               | 13 +++++
 3 files changed, 63 insertions(+)

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 4661d779d9..f671c18031 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -721,6 +721,8 @@ InitializeDispatcherData (
   if (OldCoreData == NULL) {
     PrivateData->PeimDispatcherReenter = FALSE;
     PeiInitializeFv (PrivateData, SecCoreData);
+  } else {
+  	PeiReinitializeFv (PrivateData);
   }
 
   return;
diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 7af67481f6..c684b9466e 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -1374,3 +1374,51 @@ FindNextCoreFvHandle (
 
   return &Private->Fv[Instance];
 }  
+
+/**
+  After PeiCore image is shadowed into permanent memory, all build-in FvPpi should
+  be re-installed with the instance in permanent memory and all cached FvPpi pointers in 
+  PrivateData->Fv[] array should be fixed up to be pointed to the one in permenant
+  memory.
+  
+  @param PrivateData   Pointer to PEI_CORE_INSTANCE.
+**/  
+VOID
+PeiReinitializeFv (
+  IN  PEI_CORE_INSTANCE           *PrivateData
+  )
+{
+	VOID           					*OldFfs2FvPpi;
+	EFI_PEI_PPI_DESCRIPTOR	*OldDescriptor;
+	UINTN                   Index;
+	EFI_STATUS              Status;
+
+	//
+	// Locate old build-in Ffs2 EFI_PEI_FIRMWARE_VOLUME_PPI which
+	// in flash.
+	//	
+	Status = PeiServicesLocatePpi (
+	           &gEfiFirmwareFileSystem2Guid,
+	           0,
+	           &OldDescriptor,
+	           &OldFfs2FvPpi
+	           );
+	ASSERT_EFI_ERROR (Status);
+
+	//
+	// Re-install the EFI_PEI_FIRMWARE_VOLUME_PPI for build-in Ffs2
+	// which is shadowed from flash to permanent memory within PeiCore image.
+	//
+	Status = PeiServicesReInstallPpi (OldDescriptor, &mPeiFfs2FvPpiList);
+	ASSERT_EFI_ERROR (Status);
+	
+	//
+	// Fixup all FvPpi pointers for the implementation in flash to permanent memory.
+	//
+	for (Index = 0; Index < FixedPcdGet32 (PcdPeiCoreMaxFvSupported); Index ++) {
+		if (PrivateData->Fv[Index].FvPpi == OldFfs2FvPpi) {
+			PrivateData->Fv[Index].FvPpi = &mPeiFfs2FvPpi;
+		}
+	}
+}  
+
diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index c8561d52e1..c6b41b6aaa 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -1066,4 +1066,17 @@ FindNextCoreFvHandle (
   IN UINTN              Instance
   );
     
+/**
+  After PeiCore image is shadowed into permanent memory, all build-in FvPpi should
+  be re-installed with the instance in permanent memory and all cached FvPpi pointers in 
+  PrivateData->Fv[] array should be fixed up to be pointed to the one in permenant
+  memory.
+  
+  @param PrivateData   Pointer to PEI_CORE_INSTANCE.
+**/  
+VOID
+PeiReinitializeFv (
+  IN  PEI_CORE_INSTANCE           *PrivateData
+  );
+      
 #endif
-- 
2.39.2