@@ -35,6 +35,7 @@
#include <xen/watchdog.h>
#include <asm/apic.h>
+#include <asm/bootinfo.h>
#include <asm/cpu-policy.h>
#include <asm/nmi.h>
#include <asm/processor.h>
@@ -153,16 +154,14 @@ static int __init cf_check parse_ucode(const char *s)
custom_param("ucode", parse_ucode);
static void __init microcode_scan_module(
- unsigned long *module_map,
- const multiboot_info_t *mbi)
+ unsigned long *module_map, struct boot_info *bi)
{
- module_t *mod = (module_t *)__va(mbi->mods_addr);
uint64_t *_blob_start;
unsigned long _blob_size;
struct cpio_data cd;
long offset;
const char *p = NULL;
- int i;
+ struct boot_module *bm;
ucode_blob.size = 0;
if ( !ucode_scan )
@@ -178,17 +177,14 @@ static void __init microcode_scan_module(
/*
* Try all modules and see whichever could be the microcode blob.
*/
- for ( i = 1 /* Ignore dom0 kernel */; i < mbi->mods_count; i++ )
+ for_each_boot_module(bi, bm, BOOTMOD_UNKNOWN)
{
- if ( !test_bit(i, module_map) )
- continue;
-
- _blob_start = bootstrap_map(&mod[i]);
- _blob_size = mod[i].mod_end;
+ _blob_start = bootstrap_map_bm(bm);
+ _blob_size = bm->size;
if ( !_blob_start )
{
- printk("Could not map multiboot module #%d (size: %ld)\n",
- i, _blob_size);
+ printk("Could not map boot module #%d (size: %ld)\n",
+ boot_module_index(bi, bm), _blob_size);
continue;
}
cd.data = NULL;
@@ -200,25 +196,23 @@ static void __init microcode_scan_module(
ucode_blob.data = cd.data;
break;
}
- bootstrap_map(NULL);
+ bootstrap_map_bm(NULL);
}
}
static void __init microcode_grab_module(
- unsigned long *module_map,
- const multiboot_info_t *mbi)
+ unsigned long *module_map, struct boot_info *bi)
{
- module_t *mod = (module_t *)__va(mbi->mods_addr);
-
if ( ucode_mod_idx < 0 )
- ucode_mod_idx += mbi->mods_count;
- if ( ucode_mod_idx <= 0 || ucode_mod_idx >= mbi->mods_count ||
+ ucode_mod_idx += bi->nr_modules;
+ if ( ucode_mod_idx <= 0 || ucode_mod_idx >= bi->nr_modules ||
!__test_and_clear_bit(ucode_mod_idx, module_map) )
goto scan;
- ucode_mod = mod[ucode_mod_idx];
+ bi->mods[ucode_mod_idx].type = BOOTMOD_MICROCODE;
+ ucode_mod = *bi->mods[ucode_mod_idx].mod;
scan:
if ( ucode_scan )
- microcode_scan_module(module_map, mbi);
+ microcode_scan_module(module_map, bi);
}
static struct microcode_ops __ro_after_init ucode_ops;
@@ -822,8 +816,8 @@ static int __init early_update_cache(const void *data, size_t len)
return rc;
}
-int __init microcode_init_cache(unsigned long *module_map,
- const struct multiboot_info *mbi)
+int __init microcode_init_cache(
+ unsigned long *module_map, struct boot_info *bi)
{
int rc = 0;
@@ -832,7 +826,7 @@ int __init microcode_init_cache(unsigned long *module_map,
if ( ucode_scan )
/* Need to rescan the modules because they might have been relocated */
- microcode_scan_module(module_map, mbi);
+ microcode_scan_module(module_map, bi);
if ( ucode_mod.mod_end )
rc = early_update_cache(bootstrap_map(&ucode_mod),
@@ -879,7 +873,7 @@ static int __init early_microcode_update_cpu(void)
}
int __init early_microcode_init(unsigned long *module_map,
- const struct multiboot_info *mbi)
+ struct boot_info *bi)
{
const struct cpuinfo_x86 *c = &boot_cpu_data;
int rc = 0;
@@ -922,7 +916,7 @@ int __init early_microcode_init(unsigned long *module_map,
return -ENODEV;
}
- microcode_grab_module(module_map, mbi);
+ microcode_grab_module(module_map, bi);
if ( ucode_mod.mod_end || ucode_blob.size )
rc = early_microcode_update_cpu();
@@ -20,6 +20,7 @@ enum bootmod_type {
BOOTMOD_XEN,
BOOTMOD_KERNEL,
BOOTMOD_RAMDISK,
+ BOOTMOD_MICROCODE,
};
struct boot_module {
@@ -69,6 +70,30 @@ struct boot_info {
struct boot_module mods[MAX_NR_BOOTMODS + 1];
};
+static inline struct boot_module *__init next_boot_module_by_type(
+ struct boot_info *bi, struct boot_module *bm, enum bootmod_type t)
+{
+ if ( bm == NULL )
+ bm = &bi->mods[0];
+ else
+ bm++;
+
+ for ( ; bm <= &bi->mods[bi->nr_modules]; bm++ )
+ {
+ if ( bm->type == t )
+ return bm;
+ }
+
+ return NULL;
+}
+
+#define for_each_boot_module(bi, bm, t) \
+ for ( bm = &bi->mods[0]; bm != NULL && bm <= &bi->mods[bi->nr_modules]; \
+ bm = next_boot_module_by_type(bi, bm, t) )
+
+#define boot_module_index(bi, bm) \
+ (unsigned int)(bm - &bi->mods[0])
+
#endif /* X86_BOOTINFO_H */
/*
@@ -4,6 +4,8 @@
#include <xen/types.h>
#include <xen/percpu.h>
+#include <asm/bootinfo.h>
+
#include <public/xen.h>
struct multiboot_info;
@@ -22,12 +24,12 @@ struct cpu_signature {
DECLARE_PER_CPU(struct cpu_signature, cpu_sig);
void microcode_set_module(unsigned int idx);
-int microcode_update(XEN_GUEST_HANDLE(const_void) buf,
- unsigned long len, unsigned int flags);
-int early_microcode_init(unsigned long *module_map,
- const struct multiboot_info *mbi);
-int microcode_init_cache(unsigned long *module_map,
- const struct multiboot_info *mbi);
+int microcode_update(
+ XEN_GUEST_HANDLE(const_void) buf, unsigned long len, unsigned int flags);
+int early_microcode_init(
+ unsigned long *module_map, struct boot_info *bi);
+int microcode_init_cache(
+ unsigned long *module_map, struct boot_info *bi);
int microcode_update_one(void);
#endif /* ASM_X86__MICROCODE_H */
@@ -2,6 +2,7 @@
#define __X86_SETUP_H_
#include <xen/multiboot.h>
+#include <asm/bootinfo.h>
#include <asm/numa.h>
extern const char __2M_text_start[], __2M_text_end[];
@@ -37,6 +38,7 @@ extern struct boot_info xen_boot_info;
unsigned long initial_images_nrpages(nodeid_t node);
void discard_initial_images(void);
void *bootstrap_map(const module_t *mod);
+void *bootstrap_map_bm(const struct boot_module *bm);
int remove_xen_ranges(struct rangeset *r);
@@ -499,6 +499,14 @@ void *__init bootstrap_map(const module_t *mod)
pfn_to_paddr(mod->mod_start) + mod->mod_end);
}
+void *__init bootstrap_map_bm(const struct boot_module *bm)
+{
+ if ( !bm )
+ return bootstrap_map_addr(0, 0);
+
+ return bootstrap_map_addr(bm->start, bm->start + bm->size);
+}
+
static void __init move_memory(
uint64_t dst, uint64_t src, unsigned int size)
{
@@ -1401,7 +1409,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
* TODO: load ucode earlier once multiboot modules become accessible
* at an earlier stage.
*/
- early_microcode_init(module_map, mbi);
+ early_microcode_init(module_map, bi);
if ( xen_phys_start )
{
@@ -1948,7 +1956,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
timer_init();
- microcode_init_cache(module_map, mbi); /* Needs xmalloc() */
+ microcode_init_cache(module_map, bi); /* Needs xmalloc() */
tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */
Convert the microcode loading functions to take struct boot_info, and then using struct boot_module to map and check for microcode. To keep the changes focused, continue using the struct mod to hold the reference to the microcode that is used by the late microcode logic. To support loading the microcode boot module in to the bootstrap map, introduce bootstrap_map_bm() for mapping struct boot_module. Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com> --- Changes since v6: - introduce helpers for_each_boot_module and boot_module_index - drop const due to object use changes done by helpers - converted boot module search to use for each helper - make bootstrap unmap call match bootstrap map Changes since v5: - moved bootstrap_map_bm definition to this commit --- xen/arch/x86/cpu/microcode/core.c | 46 ++++++++++++---------------- xen/arch/x86/include/asm/bootinfo.h | 25 +++++++++++++++ xen/arch/x86/include/asm/microcode.h | 14 +++++---- xen/arch/x86/include/asm/setup.h | 2 ++ xen/arch/x86/setup.c | 12 ++++++-- 5 files changed, 65 insertions(+), 34 deletions(-)