Extract common checks and initialisations from load_ucode_ap() and
save_microcode_in_initrd_amd() to load_microcode_amd_early().
load_ucode_ap() gets a quick exit for !cpu, because for the BSP there is
already a different function dealing with its update.
The original code already didn't anything, because without load_microcode_amd()
getting called apply_microcode_amd() could not do anything.
Signed-off-by: Torsten Kaiser <just.for.l...@googlemail.com>
--- a/arch/x86/kernel/microcode_amd_early.c 2013-07-22 06:22:32.000000000
+0200
+++ b/arch/x86/kernel/microcode_amd_early.c 2013-07-23 20:00:04.889508712
+0200
@@ -196,6 +196,23 @@ void __init load_ucode_amd_bsp(void)
apply_ucode_in_initrd(cd.data, cd.size);
}
+static int load_microcode_amd_early(void)
+{
+ enum ucode_state ret;
+ void *ucode;
+
+ if (ucode_loaded || !ucode_size || !initrd_start)
+ return 0;
+
+ ucode = (void *)(initrd_start + ucode_offset);
+ ret = load_microcode_amd(0, ucode, ucode_size);
+ if (ret != UCODE_OK)
+ return -EINVAL;
+
+ ucode_loaded = true;
+ return 0;
+}
+
#ifdef CONFIG_X86_32
u8 amd_bsp_mpb[MPB_MAX_SIZE];
@@ -258,17 +275,13 @@ void load_ucode_amd_ap(void)
collect_cpu_info_amd_early(&cpu_data(cpu), ucode_cpu_info + cpu);
- if (cpu && !ucode_loaded) {
- void *ucode;
-
- if (!ucode_size || !initrd_start)
- return;
+ /* BSP via load_ucode_amd_bsp() */
+ if (!cpu)
+ return;
- ucode = (void *)(initrd_start + ucode_offset);
- if (load_microcode_amd(0, ucode, ucode_size) != UCODE_OK)
- return;
- ucode_loaded = true;
- }
+ load_microcode_amd_early();
+ if (!ucode_loaded)
+ return;
apply_microcode_amd(cpu);
}
@@ -276,8 +289,6 @@ void load_ucode_amd_ap(void)
int __init save_microcode_in_initrd_amd(void)
{
- enum ucode_state ret;
- void *ucode;
#ifdef CONFIG_X86_32
unsigned int bsp = boot_cpu_data.cpu_index;
struct ucode_cpu_info *uci = ucode_cpu_info + bsp;
@@ -289,14 +300,5 @@ int __init save_microcode_in_initrd_amd(
pr_info("microcode: updated early to new patch_level=0x%08x\n",
ucode_new_rev);
- if (ucode_loaded || !ucode_size || !initrd_start)
- return 0;
-
- ucode = (void *)(initrd_start + ucode_offset);
- ret = load_microcode_amd(0, ucode, ucode_size);
- if (ret != UCODE_OK)
- return -EINVAL;
-
- ucode_loaded = true;
- return 0;
+ return load_microcode_amd_early();
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
