Patch "x86/efi: Use all 64 bit of efi_memmap in setup_e820()" has been added to the 3.14-stable tree

This is a note to let you know that I've just added the patch titled

x86/efi: Use all 64 bit of efi_memmap in setup_e820()

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     x86-efi-use-all-64-bit-of-efi_memmap-in-setup_e820.patch

and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Dmitry Skorodumov <[email protected]>
Date: Tue, 28 Jul 2015 18:38:32 +0400
Subject: x86/efi: Use all 64 bit of efi_memmap in setup_e820()

From: Dmitry Skorodumov <[email protected]>

commit 7cc03e48965453b5df1cce5062c826189b04b960 upstream.

The efi_info structure stores low 32 bits of memory map in efi_memmap and high 32 bits in efi_memmap_hi.

While constructing pointer in the setup_e820(), need to take into account all 64 bit of the pointer.

It is because on 64bit machine the function efi_get_memory_map() may return full 64bit pointer and before the patch that pointer was truncated.

The issue is triggered on Parallles virtual machine and fixed with this patch.

---
 arch/x86/boot/compressed/eboot.c |    4 ++++
 1 file changed, 4 insertions(+)

@@ -560,6 +560,10 @@ static efi_status_t setup_e820(struct bo
 		unsigned int e820_type = 0;
 		unsigned long m = efi->efi_memmap;
 
+#ifdef CONFIG_X86_64
+		m |= (u64)efi->efi_memmap_hi << 32;
+#endif
+
 		d = (efi_memory_desc_t *)(m + (i * efi->efi_memdesc_size));
 		switch (d->type) {
 		case EFI_RESERVED_TYPE:

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/x86-efi-use-all-64-bit-of-efi_memmap-in-setup_e820.patch