The patch titled
x86: dmi_scan_machine uses uninitialized address on x86/EFI
has been added to the -mm tree. Its filename is
x86-dmi_scan_machine-uses-uninitialized-address-on-x86-efi.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: x86: dmi_scan_machine uses uninitialized address on x86/EFI
From: "Thomas Jourdan" <tjourdan@xxxxxxxxxxxxxxxxxxxx>
On x86/EFI platforms, if efi_enabled is true, the dmi_scan_machine
function fails, even if valid DMI table is present. In the setup_arch
function, efi_init is called after dmi_scan_machine. But this is efi_init
which will initialize the smbios address, needed by dmi_scan_machine.
This leads to dmi_scan_machine ioremapping physical address 0, instead of
the address provided by the EFI system table. The following patch fixes
the problem.
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/setup.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN arch/x86/kernel/setup.c~x86-dmi_scan_machine-uses-uninitialized-address-on-x86-efi arch/x86/kernel/setup.c
--- a/arch/x86/kernel/setup.c~x86-dmi_scan_machine-uses-uninitialized-address-on-x86-efi
+++ a/arch/x86/kernel/setup.c
@@ -783,6 +783,9 @@ void __init setup_arch(char **cmdline_p)
finish_e820_parsing();
+ if (efi_enabled)
+ efi_init();
+
dmi_scan_machine();
dmi_check_system(bad_bios_dmi_table);
@@ -802,9 +805,6 @@ void __init setup_arch(char **cmdline_p)
insert_resource(&iomem_resource, &data_resource);
insert_resource(&iomem_resource, &bss_resource);
- if (efi_enabled)
- efi_init();
-
#ifdef CONFIG_X86_32
if (ppro_with_ram_bug()) {
e820_update_range(0x70000000ULL, 0x40000ULL, E820_RAM,
_
Patches currently in -mm which might be from tjourdan@xxxxxxxxxxxxxxxxxxxx are
x86-dmi_scan_machine-uses-uninitialized-address-on-x86-efi.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
