Skip to content

Commit

Permalink
x86/microcode: Disable builtin microcode loading on 32-bit for now
Browse files Browse the repository at this point in the history
Andy Shevchenko reported machine freezes when booting latest tip
on 32-bit setups. Problem is, the builtin microcode handling cannot
really work that early, when we haven't even enabled paging.

A proper fix would involve handling that case specially as every
other early 32-bit boot case in the microcode loader and would
require much more involved changes for which it is too late now,
more than a week before the upcoming merge window.

So, disable the builtin microcode loading on 32-bit for now.

Reported-and-tested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1433436928-31903-20-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Borislav Petkov authored and Ingo Molnar committed Jun 7, 2015
1 parent e774eaa commit ee38a90
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions arch/x86/kernel/cpu/microcode/amd_early.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,17 @@ static void apply_ucode_in_initrd(void *ucode, size_t size, bool save_patch)

static bool __init load_builtin_amd_microcode(struct cpio_data *cp, int family)
{
#ifdef CONFIG_X86_64
char fw_name[36] = "amd-ucode/microcode_amd.bin";

if (family >= 0x15)
snprintf(fw_name, sizeof(fw_name),
"amd-ucode/microcode_amd_fam%.2xh.bin", family);

return get_builtin_firmware(cp, fw_name);
#else
return false;
#endif
}

void __init load_ucode_amd_bsp(int family)
Expand Down
4 changes: 4 additions & 0 deletions arch/x86/kernel/cpu/microcode/intel_early.c
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,7 @@ EXPORT_SYMBOL_GPL(save_mc_for_early);

static bool __init load_builtin_intel_microcode(struct cpio_data *cp)
{
#ifdef CONFIG_X86_64
u32 eax = 0x00000001, ebx, ecx = 0, edx;
int family, model, stepping;
char name[30];
Expand All @@ -536,6 +537,9 @@ static bool __init load_builtin_intel_microcode(struct cpio_data *cp)
sprintf(name, "intel-ucode/%02x-%02x-%02x", family, model, stepping);

return get_builtin_firmware(cp, name);
#else
return false;
#endif
}

static __initdata char ucode_name[] = "kernel/x86/microcode/GenuineIntel.bin";
Expand Down

0 comments on commit ee38a90

Please sign in to comment.