mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-03-25 07:53:35 +07:00
x86/boot/e820: Move e820_reserve_setup_data() to e820.c
The e820_reserve_setup_data() is local to arch/x86/kernel/setup.c, but it is E820 functionality - so move it to e820.c to better isolate E820 functionality. No change in functionality. Cc: Alex Thorlton <athorlton@sgi.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Huang, Ying <ying.huang@intel.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Juergen Gross <jgross@suse.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul Jackson <pj@sgi.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: Tejun Heo <tj@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Wei Yang <richard.weiyang@gmail.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
914053c08e
commit
da92139bff
@ -22,6 +22,7 @@ extern unsigned long e820_end_of_ram_pfn(void);
|
|||||||
extern unsigned long e820_end_of_low_ram_pfn(void);
|
extern unsigned long e820_end_of_low_ram_pfn(void);
|
||||||
extern u64 early_reserve_e820(u64 sizet, u64 align);
|
extern u64 early_reserve_e820(u64 sizet, u64 align);
|
||||||
extern void e820__memblock_setup(void);
|
extern void e820__memblock_setup(void);
|
||||||
|
extern void e820_reserve_setup_data(void);
|
||||||
extern void finish_e820_parsing(void);
|
extern void finish_e820_parsing(void);
|
||||||
extern void e820_reserve_resources(void);
|
extern void e820_reserve_resources(void);
|
||||||
extern void e820_reserve_resources_late(void);
|
extern void e820_reserve_resources_late(void);
|
||||||
|
@ -910,6 +910,28 @@ static int __init parse_memmap_opt(char *str)
|
|||||||
}
|
}
|
||||||
early_param("memmap", parse_memmap_opt);
|
early_param("memmap", parse_memmap_opt);
|
||||||
|
|
||||||
|
void __init e820_reserve_setup_data(void)
|
||||||
|
{
|
||||||
|
struct setup_data *data;
|
||||||
|
u64 pa_data;
|
||||||
|
|
||||||
|
pa_data = boot_params.hdr.setup_data;
|
||||||
|
if (!pa_data)
|
||||||
|
return;
|
||||||
|
|
||||||
|
while (pa_data) {
|
||||||
|
data = early_memremap(pa_data, sizeof(*data));
|
||||||
|
e820_update_range(pa_data, sizeof(*data)+data->len, E820_RAM, E820_RESERVED_KERN);
|
||||||
|
pa_data = data->next;
|
||||||
|
early_memunmap(data, sizeof(*data));
|
||||||
|
}
|
||||||
|
|
||||||
|
sanitize_e820_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);
|
||||||
|
memcpy(e820_table_firmware, e820_table, sizeof(struct e820_table));
|
||||||
|
printk(KERN_INFO "extended physical RAM map:\n");
|
||||||
|
e820_print_map("reserve setup_data");
|
||||||
|
}
|
||||||
|
|
||||||
void __init finish_e820_parsing(void)
|
void __init finish_e820_parsing(void)
|
||||||
{
|
{
|
||||||
if (userdef) {
|
if (userdef) {
|
||||||
|
@ -441,29 +441,6 @@ static void __init parse_setup_data(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init e820_reserve_setup_data(void)
|
|
||||||
{
|
|
||||||
struct setup_data *data;
|
|
||||||
u64 pa_data;
|
|
||||||
|
|
||||||
pa_data = boot_params.hdr.setup_data;
|
|
||||||
if (!pa_data)
|
|
||||||
return;
|
|
||||||
|
|
||||||
while (pa_data) {
|
|
||||||
data = early_memremap(pa_data, sizeof(*data));
|
|
||||||
e820_update_range(pa_data, sizeof(*data)+data->len,
|
|
||||||
E820_RAM, E820_RESERVED_KERN);
|
|
||||||
pa_data = data->next;
|
|
||||||
early_memunmap(data, sizeof(*data));
|
|
||||||
}
|
|
||||||
|
|
||||||
sanitize_e820_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);
|
|
||||||
memcpy(e820_table_firmware, e820_table, sizeof(struct e820_table));
|
|
||||||
printk(KERN_INFO "extended physical RAM map:\n");
|
|
||||||
e820_print_map("reserve setup_data");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __init memblock_x86_reserve_range_setup_data(void)
|
static void __init memblock_x86_reserve_range_setup_data(void)
|
||||||
{
|
{
|
||||||
struct setup_data *data;
|
struct setup_data *data;
|
||||||
|
Loading…
Reference in New Issue
Block a user