From 63e70348e47390cf3d22687cd09f69d539081e76 Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Wed, 4 Sep 2013 02:20:25 +0000 Subject: [PATCH] Fixed the issue in PeiCore on Load Module At Fixed Address logic Signed-off-by: Liming Gao Reviewed-by: Star Zeng git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14623 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c | 6 +++--- MdeModulePkg/MdeModulePkg.dec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c index 0392cfe1e8..2063fa4dbb 100644 --- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c +++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c @@ -1,7 +1,7 @@ /** @file EFI PEI Core dispatch services -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
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 @@ -305,7 +305,7 @@ PeiLoadFixAddressHook( // // If range described in this hob is not system memory or heigher than MAX_ADDRESS, ignored. // - if (ResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY && + if (ResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY || ResourceHob->PhysicalStart + ResourceHob->ResourceLength > MAX_ADDRESS) { continue; } @@ -375,7 +375,7 @@ PeiLoadFixAddressHook( // // If range described in this hob is not system memory or heigher than MAX_ADDRESS, ignored. // - if (NextResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY && NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength > MAX_ADDRESS) { + if (NextResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY || NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength > MAX_ADDRESS) { continue; } // diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 4ae24eb80e..895c0497fe 100644 --- 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 ## Flag of enabling/disabling the feature of Loading Module at Fixed Address - # -1: Enable the feature as fixed offset to TOLM - # 0: Disable the feature. - # Positive Value: Enable the feature as fixed absolute address, and the value is the top memory address + # 0xFFFFFFFFFFFFFFFF: Enable the feature as fixed offset to TOLM + # 0: Disable the feature + # Other Value: Enable the feature as fixed absolute address, and the value is the top memory address gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|0|UINT64|0x30001015 ## Smbios version