Skip to content

Commit

Permalink
x86: fix CONFIG_X86_RESERVE_LOW_64K=y
Browse files Browse the repository at this point in the history
The bad_bios_dmi_table() quirk never triggered because we do DMI setup
too late. Move it a bit earlier.

Also change the CONFIG_X86_RESERVE_LOW_64K quirk to operate on the e820
table directly instead of messing with early reservations - this handles
overlaps (which do occur in this low range of RAM) more gracefully.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Sep 22, 2008
1 parent 5871c6b commit 2216d19
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions arch/x86/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,8 @@ static int __init dmi_low_memory_corruption(const struct dmi_system_id *d)
"%s detected: BIOS may corrupt low RAM, working it around.\n",
d->ident);

reserve_early_overlap_ok(0x0, 0x10000, "BIOS quirk");
e820_update_range(0, 0x10000, E820_RAM, E820_RESERVED);
sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);

return 0;
}
Expand Down Expand Up @@ -784,8 +785,6 @@ void __init setup_arch(char **cmdline_p)
printk(KERN_INFO "Command line: %s\n", boot_command_line);
#endif

dmi_check_system(bad_bios_dmi_table);

early_cpu_init();
early_ioremap_init();

Expand Down Expand Up @@ -880,6 +879,10 @@ void __init setup_arch(char **cmdline_p)

finish_e820_parsing();

dmi_scan_machine();

dmi_check_system(bad_bios_dmi_table);

#ifdef CONFIG_X86_32
probe_roms();
#endif
Expand Down Expand Up @@ -967,8 +970,6 @@ void __init setup_arch(char **cmdline_p)
vsmp_init();
#endif

dmi_scan_machine();

io_delay_init();

/*
Expand Down

0 comments on commit 2216d19

Please sign in to comment.