The changes in 871b72dd "x86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup of synchronization logic" introduced a check that prevents built-in microcode from being loaded before init starts.
Conditionalise it on early microcode loading, so we get the expected behaviour when early microcode loading is enabled, and when it is not. This has potential importance as BIOSes often don't load the current microcode. Signed-off-by: Daniel J Blueman <[email protected]> --- arch/x86/kernel/cpu/microcode/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 36a8361..fa7f9fc 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -391,9 +391,11 @@ static enum ucode_state microcode_init_cpu(int cpu, bool refresh_fw) if (collect_cpu_info(cpu)) return UCODE_ERROR; +#if !defined(CONFIG_MICROCODE_AMD_EARLY) && !defined(CONFIG_MICROCODE_INTEL_EARLY) /* --dimm. Trigger a delayed update? */ if (system_state != SYSTEM_RUNNING) return UCODE_NFOUND; +#endif ustate = microcode_ops->request_microcode_fw(cpu, µcode_pdev->dev, refresh_fw); -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
