Commit 77ea8c94 authored Dec 20, 2013 by Dave Young Committed by Matt Fleming Dec 29, 2013

x86: Reserve setup_data ranges late after parsing memmap cmdline



Currently e820_reserve_setup_data() is called before parsing early
params, it works in normal case. But for memmap=exactmap, the final
memory ranges are created after parsing memmap= cmdline params, so the
previous e820_reserve_setup_data() has no effect. For example,
setup_data ranges will still be marked as normal system ram, thus when
later sysfs driver ioremap them kernel will warn about mapping normal
ram.

This patch fix it by moving the e820_reserve_setup_data() callback after
parsing early params so they can be set as reserved ranges and later
ioremap will be fine with it.

Signed-off-by: Dave Young <dyoung@redhat.com>
Acked-by: Borislav Petkov <bp@suse.de>
Tested-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

parent 5039e316

arch/x86/kernel/setup.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -927,8 +927,6 @@ void __init setup_arch(char **cmdline_p)
		iomem_resource.end = (1ULL << boot_cpu_data.x86_phys_bits) - 1;
		setup_memory_map();
		parse_setup_data();
		/* update the e820_saved too */
		e820_reserve_setup_data();

		copy_edd();

		@@ -990,6 +988,8 @@ void __init setup_arch(char **cmdline_p)
		early_dump_pci_devices();
		#endif

		/* update the e820_saved too */
		e820_reserve_setup_data();
		finish_e820_parsing();

		if (efi_enabled(EFI_BOOT))

Admin message