[PATCH 2/3] x86: avoid efi_reserve_boot_services

[Jerry Hoemann <jerry.hoemann@hp.com>]

Some platform have firmware that violate UEFI spec and access boot service
code or data segments after the system has called Exit Boot Services.

The call to efi_reserve_boot_services is a work around to avoid using
boot service memory until after the kernel has done Set Virtual Map.

However, this reservation fragments memory which can cause
large allocations early in boot (e.g. crash kernel) to fail.

Avoid calling efi_reserve_boot_services if the memmap
is "correct."

Signed-off-by: Jerry Hoemann <jerry.hoemann@hp.com>
---
 arch/x86/kernel/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index f0de629..1186ff9 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1074,7 +1074,7 @@ void __init setup_arch(char **cmdline_p)
 	 * The EFI specification says that boot service code won't be called
 	 * after ExitBootServices(). This is, in fact, a lie.
 	 */
-	if (efi_enabled(EFI_MEMMAP))
+	if (efi_enabled(EFI_MEMMAP) && !efi_enabled(EFI_MEMMAP_CORRECT))
 		efi_reserve_boot_services();
 
 	/* preallocate 4k for mptable mpc */
-- 
1.7.11.3