Skip to contentSkip to conversation

x86: Populate virtual address field of all EFI memmap entries

PATCH New Matthew Garrett 1 participant 1 message Apr 28, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: Populate virtual address field of all EFI memmap entries

Our current implementation of SetVirtualAddressMap passes back the entire memory map it received from the firmware, but only modifies entries that have the runtime attribute set. Experiments (mostly involving screaming) with real-world EFI implementations suggests that some will call ConvertPointer on data that exist outside runtime regions anyway. The easiest fix here seems to be to continue remapping runtime regions and just to copy the physical address to the virtal address for other regions.

This doesn't fix any observed problems with our current implementation, but it seems better to be safe than sorry.

---
 arch/x86/platform/efi/efi.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
arch/x86/platform/efi/efi.c +3 -1
index 0fe27d7..f11b3b0 100644
@@ -507,8 +507,10 @@ void __init efi_enter_virtual_mode(void)
 	efi.systab = NULL;
 	for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
 		md = p;
-		if (!(md->attribute & EFI_MEMORY_RUNTIME))
+		if (!(md->attribute & EFI_MEMORY_RUNTIME)) {
+			md->virt_addr = md->phys_addr;
 			continue;
+		}
 
 		size = md->num_pages << EFI_PAGE_SHIFT;
 		end = md->phys_addr + size;
Signature · 1 line
1.7.4.4