x86/boot: Run reserve_bios_regions() after we initialize the memory map

amluto · Ingo Molnar · commit 007b75605338 · 2016-08-11T11:14:59.000+02:00
reserve_bios_regions() is a quirk that reserves memory that we might otherwise think is available. There's no need to run it so early, and running it before we have the memory map initialized with its non-quirky inputs makes it hard to make reserve_bios_regions() more intelligent. Move it right after we populate the memblock state. Signed-off-by: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mario Limonciello <mario_limonciello@dell.com> Cc: Matt Fleming <mfleming@suse.de> Cc: Matthew Garrett <mjg59@srcf.ucam.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/59f58618911005c799c6c9979ce6ae4881d907c2.1470821230.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
@@ -25,8 +25,6 @@ static void __init i386_default_early_setup(void)
 	/* Initialize 32bit specific setup functions */
 	x86_init.resources.reserve_resources = i386_reserve_resources;
 	x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc;
-
-	reserve_bios_regions();
 }
 
 asmlinkage __visible void __init i386_start_kernel(void)
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
@@ -183,7 +183,6 @@ void __init x86_64_start_reservations(char *real_mode_data)
 		copy_bootdata(__va(real_mode_data));
 
 	x86_early_init_platform_quirks();
-	reserve_bios_regions();
 
 	switch (boot_params.hdr.hardware_subarch) {
 	case X86_SUBARCH_INTEL_MID:
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
@@ -1101,6 +1101,8 @@ void __init setup_arch(char **cmdline_p)
 		efi_find_mirror();
 	}
 
+	reserve_bios_regions();
+
 	/*
 	 * The EFI specification says that boot service code won't be called
 	 * after ExitBootServices(). This is, in fact, a lie.

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ static void __init i386_default_early_setup(void)`
`25`	`25`	`/* Initialize 32bit specific setup functions */`
`26`	`26`	`x86_init.resources.reserve_resources = i386_reserve_resources;`
`27`	`27`	`x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc;`
`28`		`-`
`29`		`- reserve_bios_regions();`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`asmlinkage __visible void __init i386_start_kernel(void)`
Original file line number	Diff line number	Diff line change
`@@ -1101,6 +1101,8 @@ void __init setup_arch(char **cmdline_p)`
`1101`	`1101`	`efi_find_mirror();`
`1102`	`1102`	`}`
`1103`	`1103`
	`1104`	`+ reserve_bios_regions();`
	`1105`	`+`
`1104`	`1106`	`/*`
`1105`	`1107`	`* The EFI specification says that boot service code won't be called`
`1106`	`1108`	`* after ExitBootServices(). This is, in fact, a lie.`