@@ -58,7 +58,7 @@
*/
#define MICROCODE_UPDATE_TIMEOUT_US 1000000
-static struct boot_module __initdata ucode_mod;
+static struct boot_module __initdata *ucode_mod;
static signed int __initdata ucode_mod_idx;
static bool __initdata ucode_mod_forced;
static unsigned int nr_cores;
@@ -208,7 +208,7 @@ static void __init microcode_grab_module(
!__test_and_clear_bit(ucode_mod_idx, module_map) )
goto scan;
bi->mods[ucode_mod_idx].type = BOOTMOD_MICROCODE;
- ucode_mod = bi->mods[ucode_mod_idx];
+ ucode_mod = &bi->mods[ucode_mod_idx];
scan:
if ( ucode_scan )
microcode_scan_module(module_map, bi);
@@ -766,10 +766,10 @@ static int __init cf_check microcode_init(void)
ucode_blob.size = 0;
ucode_blob.data = NULL;
}
- else if ( ucode_mod.size )
+ else if ( ucode_mod && !ucode_mod->consumed )
{
bootstrap_map_bm(NULL);
- ucode_mod.size = 0;
+ ucode_mod->consumed = true;
}
return 0;
@@ -823,14 +823,14 @@ int __init microcode_init_cache(
if ( !ucode_ops.apply_microcode )
return -ENODEV;
- if ( ucode_scan )
- /* Need to rescan the modules because they might have been relocated */
+ /* Scan if microcode was not detected earlier */
+ if ( !ucode_mod )
microcode_scan_module(module_map, bi);
- if ( ucode_mod.size )
- rc = early_update_cache(bootstrap_map_bm(&ucode_mod),
- ucode_mod.size);
- else if ( ucode_blob.size )
+ if ( ucode_mod && !ucode_mod->consumed )
+ rc = early_update_cache(bootstrap_map_bm(ucode_mod),
+ ucode_mod->size);
+ else if ( ucode_mod && ucode_blob.size )
rc = early_update_cache(ucode_blob.data, ucode_blob.size);
return rc;
@@ -848,10 +848,10 @@ static int __init early_microcode_update_cpu(void)
len = ucode_blob.size;
data = ucode_blob.data;
}
- else if ( ucode_mod.size )
+ else if ( ucode_mod && !ucode_mod->consumed )
{
- len = ucode_mod.size;
- data = bootstrap_map_bm(&ucode_mod);
+ len = ucode_mod->size;
+ data = bootstrap_map_bm(ucode_mod);
}
if ( !data )
@@ -917,7 +917,7 @@ int __init early_microcode_init(unsigned long *module_map,
microcode_grab_module(module_map, bi);
- if ( ucode_mod.size || ucode_blob.size )
+ if ( ucode_mod || ucode_blob.size )
rc = early_microcode_update_cpu();
/*
To track if the microcode boot module was loaded, a copy of the boot module is kept. The size element of this copy is set to zero as the indicator that the microcode was loaded. A side effect is that the modules have to be rescanned to find the boot module post-relocation, so the cache copy can be created. Use the consumed boot module flag to track the loading of the microcode boot module. This removes the need to manipulate the boot module size element, no longer requiring the copy, thus allowing it to be replaced by a reference. As a result it is no longer necessary to rescan the boot modules after relocation has occurred. Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> --- Changes since v6: - adjust logic to the change of consumed flag to being a bitfield --- xen/arch/x86/cpu/microcode/core.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)