Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / arch / x86 / kernel / cpu / microcode / intel_early.c

diff --git a/arch/x86/kernel/cpu/microcode/intel_early.c b/arch/x86/kernel/cpu/microcode/intel_early.c
index b88343f..ec9df6f 100644 (file)
--- a/arch/x86/kernel/cpu/microcode/intel_early.c
+++ b/arch/x86/kernel/cpu/microcode/intel_early.c
@@ -650,8 +650,7 @@ static inline void print_ucode(struct ucode_cpu_info *uci)
 }
 #endif
 
-static int apply_microcode_early(struct mc_saved_data *mc_saved_data,
-                                struct ucode_cpu_info *uci)
+static int apply_microcode_early(struct ucode_cpu_info *uci, bool early)
 {
        struct microcode_intel *mc_intel;
        unsigned int val[2];
@@ -680,7 +679,10 @@ static int apply_microcode_early(struct mc_saved_data *mc_saved_data,
 #endif
        uci->cpu_sig.rev = val[1];
 
-       print_ucode(uci);
+       if (early)
+               print_ucode(uci);
+       else
+               print_ucode_info(uci, mc_intel->hdr.date);
 
        return 0;
 }
@@ -715,12 +717,17 @@ _load_ucode_intel_bsp(struct mc_saved_data *mc_saved_data,
                      unsigned long initrd_end_early,
                      struct ucode_cpu_info *uci)
 {
+       enum ucode_state ret;
+
        collect_cpu_info_early(uci);
        scan_microcode(initrd_start_early, initrd_end_early, mc_saved_data,
                       mc_saved_in_initrd, uci);
-       load_microcode(mc_saved_data, mc_saved_in_initrd,
-                      initrd_start_early, uci);
-       apply_microcode_early(mc_saved_data, uci);
+
+       ret = load_microcode(mc_saved_data, mc_saved_in_initrd,
+                            initrd_start_early, uci);
+
+       if (ret == UCODE_OK)
+               apply_microcode_early(uci, true);
 }
 
 void __init
@@ -749,7 +756,8 @@ load_ucode_intel_bsp(void)
        initrd_end_early = initrd_start_early + ramdisk_size;
 
        _load_ucode_intel_bsp(&mc_saved_data, mc_saved_in_initrd,
-                             initrd_start_early, initrd_end_early, &uci);
+                             initrd_start_early, initrd_end_early,
+                             &uci);
 #endif
 }
 
@@ -783,5 +791,23 @@ void load_ucode_intel_ap(void)
        collect_cpu_info_early(&uci);
        load_microcode(mc_saved_data_p, mc_saved_in_initrd_p,
                       initrd_start_addr, &uci);
-       apply_microcode_early(mc_saved_data_p, &uci);
+       apply_microcode_early(&uci, true);
+}
+
+void reload_ucode_intel(void)
+{
+       struct ucode_cpu_info uci;
+       enum ucode_state ret;
+
+       if (!mc_saved_data.mc_saved_count)
+               return;
+
+       collect_cpu_info_early(&uci);
+
+       ret = generic_load_microcode_early(mc_saved_data.mc_saved,
+                                          mc_saved_data.mc_saved_count, &uci);
+       if (ret != UCODE_OK)
+               return;
+
+       apply_microcode_early(&uci, false);
 }