tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/DxeCore: Filter out all paging capabilities 

Some OSs will treat EFI_MEMORY_DESCRIPTOR.Attribute as really
set attributes and change memory paging attribute accordingly.
But current EFI_MEMORY_DESCRIPTOR.Attribute is assigned by
value from Capabilities in GCD memory map. This might cause
boot problems. Clearing all paging related capabilities can
workaround it. The code added in this patch is supposed to
be removed once the usage of EFI_MEMORY_DESCRIPTOR.Attribute
is clarified in UEFI spec and adopted by both EDK-II Core and
all supported OSs.

Laszlo did a thorough test on OVMF emulated platform. The details
can be found at
    https://bugzilla.tianocore.org/show_bug.cgi?id=753#c10

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Jian J Wang 2017-11-23 09:48:33 +08:00 committed by Star Zeng
parent 768bd96784
commit e38451cd9a
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MdeModulePkg/Core/Dxe/Mem/Page.c
View File

@ -1687,6 +1687,7 @@ CoreGetMemoryMap (
EFI_GCD_MAP_ENTRY MergeGcdMapEntry; EFI_GCD_MAP_ENTRY MergeGcdMapEntry;
EFI_MEMORY_TYPE Type; EFI_MEMORY_TYPE Type;
EFI_MEMORY_DESCRIPTOR *MemoryMapStart; EFI_MEMORY_DESCRIPTOR *MemoryMapStart;
EFI_MEMORY_DESCRIPTOR *MemoryMapEnd;
// //
// Make sure the parameters are valid // Make sure the parameters are valid
@ -1896,6 +1897,25 @@ CoreGetMemoryMap (
// //
BufferSize = ((UINT8 *)MemoryMap - (UINT8 *)MemoryMapStart); BufferSize = ((UINT8 *)MemoryMap - (UINT8 *)MemoryMapStart);
//
// Note: Some OSs will treat EFI_MEMORY_DESCRIPTOR.Attribute as really
// set attributes and change memory paging attribute accordingly.
// But current EFI_MEMORY_DESCRIPTOR.Attribute is assigned by
// value from Capabilities in GCD memory map. This might cause
// boot problems. Clearing all paging related capabilities can
// workaround it. Following code is supposed to be removed once
// the usage of EFI_MEMORY_DESCRIPTOR.Attribute is clarified in
// UEFI spec and adopted by both EDK-II Core and all supported
// OSs.
//
MemoryMapEnd = MemoryMap;
MemoryMap = MemoryMapStart;
while (MemoryMap < MemoryMapEnd) {
MemoryMap->Attribute &= ~(UINT64)(EFI_MEMORY_RP | EFI_MEMORY_RO |
EFI_MEMORY_XP);
MemoryMap = NEXT_MEMORY_DESCRIPTOR (MemoryMap, Size);
}
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
Done: Done: