Fixed the issue in PeiCore on Load Module At Fixed Address logic

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14623 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 0392cfe1e852177da635ed5c0ad839c331fc5599..2063fa4dbb26f1883071564b59cebf534c7bf0de 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -1,7 +1,7 @@
 /** @file\r
   EFI PEI Core dispatch services\r
   \r
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -305,7 +305,7 @@ PeiLoadFixAddressHook(
       //\r
       // If range described in this hob is not system memory or heigher than MAX_ADDRESS, ignored.\r
       //\r
-      if (ResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY &&\r
+      if (ResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY ||\r
           ResourceHob->PhysicalStart + ResourceHob->ResourceLength > MAX_ADDRESS)   {\r
         continue;\r
       }   \r
@@ -375,7 +375,7 @@ PeiLoadFixAddressHook(
           //\r
           // If range described in this hob is not system memory or heigher than MAX_ADDRESS, ignored.\r
           //\r
-          if (NextResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY && NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength > MAX_ADDRESS) {\r
+          if (NextResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY || NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength > MAX_ADDRESS) {\r
             continue;\r
           }\r
           //\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 4ae24eb80ee86563689e5b52243816ae0e6314c6..895c0497fe0bb815db3606e6764f998a2d114938 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -574,9 +574,9 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdCapsuleCoalesceFile|{ 0xA6, 0xE4, 0xFD, 0xF7, 0x4C, 0x29, 0x3c, 0x49, 0xB5, 0x0F, 0x97, 0x34, 0x55, 0x3B, 0xB7, 0x57 }|VOID*|0x30000017\r
 \r
   ## Flag of enabling/disabling the feature of Loading Module at Fixed Address \r
-  #  -1: Enable the feature as fixed offset to TOLM\r
-  #   0: Disable the feature.\r
-  #  Positive Value:  Enable the feature as fixed absolute address, and the value is the top memory address \r
+  #  0xFFFFFFFFFFFFFFFF: Enable the feature as fixed offset to TOLM\r
+  #  0:                  Disable the feature\r
+  #  Other Value:        Enable the feature as fixed absolute address, and the value is the top memory address \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|0|UINT64|0x30001015\r
 \r
   ## Smbios version\r