1) PcdFlashNvStorageFtwWorkingSize, PcdFlashNvStorageFtwWorkingBase, PcdFlashNvStorageFtwSpareSize, PcdFlashNvStorageFtwSpareBase, PcdFlashNvStorageVariableSize PcdFlashNvStorageVariableBase should in gEfiMdeModulePkgTokenSpaceGuid.

2) Use FlashMapHob to get the address and length of FV instead of using PCD. 
3) Use hard code environment in WinNtBusDriver but not dynamic PCD.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3106 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 41 insertions, 15 deletions

diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.c b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.c
index 38fe11d..a2ba2b4 100644
--- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.c
+++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.c
@@ -634,7 +634,8 @@ InitializeFtwLite (
   UINTN                               Offset;

   EFI_FV_BLOCK_MAP_ENTRY              *FvbMapEntry;

   UINT32                              LbaIndex;

-

+  EFI_PEI_HOB_POINTERS                FvHob;

+  EFI_FLASH_MAP_ENTRY_DATA            *FlashMapEntry;

   //

   // Allocate Private data of this driver,

   // INCLUDING THE FtwWorkSpace[FTW_WORK_SPACE_SIZE].

@@ -665,12 +666,34 @@ InitializeFtwLite (
   FtwLiteDevice->FtwWorkSpaceHeader = (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER *) FtwLiteDevice->FtwWorkSpace;

 

   FtwLiteDevice->FtwLastRecord      = NULL;

+        

+  //

+  // BUGBUG: Here should use Pcd after build tool support dynamic PCD

+  //        

+  FtwLiteDevice->SpareAreaLength  = 0;

+  FtwLiteDevice->WorkSpaceLength  = 0;

+  FvHob.Raw = GetHobList ();

+  while ((FvHob.Raw = GetNextGuidHob (&gEfiFlashMapHobGuid, FvHob.Raw)) != NULL) {

 

-  FtwLiteDevice->WorkSpaceAddress = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageFtwWorkingBase);

-  FtwLiteDevice->WorkSpaceLength  = (UINTN) PcdGet32 (PcdFlashNvStorageFtwWorkingSize);

-

-  FtwLiteDevice->SpareAreaAddress = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageFtwSpareBase);

-  FtwLiteDevice->SpareAreaLength  = (UINTN) PcdGet32 (PcdFlashNvStorageFtwSpareSize);

+    FlashMapEntry = (EFI_FLASH_MAP_ENTRY_DATA *) GET_GUID_HOB_DATA (FvHob.Guid);

+      

+    //

+    // Get the FTW work space Flash Map SUB area

+    //

+    if ((FlashMapEntry->AreaType == EFI_FLASH_AREA_FTW_STATE) && (FlashMapEntry->NumEntries == 1)) {

+      FtwLiteDevice->WorkSpaceAddress = FlashMapEntry->Entries[0].Base;

+      FtwLiteDevice->WorkSpaceLength  = (UINTN) FlashMapEntry->Entries[0].Length;

+    }

+    //

+    // Get the FTW backup SUB area

+    //

+    if ((FlashMapEntry->AreaType == EFI_FLASH_AREA_FTW_BACKUP) && (FlashMapEntry->NumEntries == 1)) {

+      FtwLiteDevice->SpareAreaAddress = FlashMapEntry->Entries[0].Base;

+      FtwLiteDevice->SpareAreaLength  = (UINTN) FlashMapEntry->Entries[0].Length;

+    }

+    

+    FvHob.Raw = GET_NEXT_HOB (FvHob);

+  }

 

   ASSERT ((FtwLiteDevice->WorkSpaceLength != 0) && (FtwLiteDevice->SpareAreaLength != 0));

 

diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.h b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.h
index 8bc122d..0701532 100644
--- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.h
+++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.h
@@ -38,6 +38,7 @@ Abstract:
 //

 #include <Protocol/PciRootBridgeIo.h>

 #include <Guid/SystemNvDataGuid.h>

+#include <Guid/FlashMapHob.h>

 #include <Protocol/FaultTolerantWriteLite.h>

 #include <Protocol/FirmwareVolumeBlock.h>

 //

@@ -49,8 +50,10 @@ Abstract:
 #include <Library/BaseMemoryLib.h>

 #include <Library/MemoryAllocationLib.h>

 #include <Library/UefiBootServicesTableLib.h>

+#include <Library/HobLib.h>

 

 #include <Common/WorkingBlockHeader.h>

+#include <Common/FlashMap.h>

 

 #define EFI_D_FTW_LITE  EFI_D_ERROR

 #define EFI_D_FTW_INFO  EFI_D_INFO

diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.inf b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.inf
index 155b4e2..4f47d60 100644
--- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.inf
+++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.inf
@@ -88,7 +88,7 @@
   UefiDriverEntryPoint

   DebugLib

   PcdLib

-

+  HobLib

 

 ################################################################################

 #

@@ -98,7 +98,7 @@
 

 [Guids]

   gEfiSystemNvDataFvGuid                        # ALWAYS_CONSUMED

-

+  gEfiFlashMapHobGuid

 

 ################################################################################

 #

@@ -125,10 +125,10 @@
 ################################################################################

 

 [PcdsDynamic.common]

-  PcdFlashNvStorageFtwWorkingSize|gEfiGenericPlatformTokenSpaceGuid

-  PcdFlashNvStorageFtwWorkingBase|gEfiGenericPlatformTokenSpaceGuid

-  PcdFlashNvStorageFtwSpareSize|gEfiGenericPlatformTokenSpaceGuid

-  PcdFlashNvStorageFtwSpareBase|gEfiGenericPlatformTokenSpaceGuid

+  PcdFlashNvStorageFtwWorkingSize|gEfiMdeModulePkgTokenSpaceGuid

+  PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid

+  PcdFlashNvStorageFtwSpareSize|gEfiMdeModulePkgTokenSpaceGuid

+  PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid

 

 ################################################################################

 #

diff --git a/MdeModulePkg/Universal/VariablePei/Variable.inf b/MdeModulePkg/Universal/VariablePei/Variable.inf
index 434c299..72a6b79 100644
--- a/MdeModulePkg/Universal/VariablePei/Variable.inf
+++ b/MdeModulePkg/Universal/VariablePei/Variable.inf
@@ -63,7 +63,7 @@
   gEfiPeiReadOnlyVariable2PpiGuid                # PPI ALWAYS_CONSUMED

 

 [PcdsDynamic.common]

-  PcdFlashNvStorageVariableBase|gEfiGenericPlatformTokenSpaceGuid

+  PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid

 

 [Depex]

   TRUE

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf
index bdddbe1..8236cd9 100644
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf
+++ b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf
@@ -105,8 +105,8 @@
 ################################################################################

 

 [PcdsDynamic.common]

-  PcdFlashNvStorageVariableSize|gEfiGenericPlatformTokenSpaceGuid

-  PcdFlashNvStorageVariableBase|gEfiGenericPlatformTokenSpaceGuid

+  PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid

+  PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid

 

 

 ################################################################################