From 54047cedab338b6688db9ffe9d24399ddde818ba Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 25 Oct 2024 17:39:06 +0100 Subject: [PATCH] x86/ucode: Break early_microcode_load() out of early_microcode_init() microcode_grab_module() and early_microcode_update_cpu() are logically one task that passes state via static variables. We intend to delete said static variables; start by breaking these functions out of early_microcode_init(). No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: Daniel P. Smith --- xen/arch/x86/cpu/microcode/core.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index 9a2cc631d2..ef9aee4a79 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -876,6 +876,22 @@ static int __init early_microcode_update_cpu(void) return microcode_update_cpu(patch, 0); } +/* + * There are several tasks: + * - Locate the ucode blob in the boot modules. + * - Parse and attempt in-place load. + * - Inform microcode_init_cache() of how to find the blob again. + */ +static int __init early_microcode_load(struct boot_info *bi) +{ + microcode_grab_module(bi); + + if ( !ucode_mod.mod_end && !ucode_blob.size ) + return 0; + + return early_microcode_update_cpu(); +} + int __init early_microcode_init(struct boot_info *bi) { const struct cpuinfo_x86 *c = &boot_cpu_data; @@ -919,10 +935,7 @@ int __init early_microcode_init(struct boot_info *bi) return -ENODEV; } - microcode_grab_module(bi); - - if ( ucode_mod.mod_end || ucode_blob.size ) - rc = early_microcode_update_cpu(); + rc = early_microcode_load(bi); /* * Some CPUID leaves and MSRs are only present after microcode updates -- 2.39.5