x86/microcode: Use the exported bootstrap_map() function

... rather than obtaining it via function pointer.  The internal ucode_mod_map
function pointer can also be dropped.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c
index 77c1efc97f9684208fd6c0470f98b15e709d4097..4163f50bb7f90e3c9818950736379453747f919c 100644 (file)
--- a/xen/arch/x86/microcode.c
+++ b/xen/arch/x86/microcode.c
@@ -40,7 +40,6 @@
 #include <asm/microcode.h>
 
 static module_t __initdata ucode_mod;
-static void *(*__initdata ucode_mod_map)(const module_t *);
 static signed int __initdata ucode_mod_idx;
 static bool_t __initdata ucode_mod_forced;
 
@@ -96,8 +95,7 @@ custom_param("ucode", parse_ucode);
 
 void __init microcode_scan_module(
     unsigned long *module_map,
-    const multiboot_info_t *mbi,
-    void *(*bootmap)(const module_t *))
+    const multiboot_info_t *mbi)
 {
     module_t *mod = (module_t *)__va(mbi->mods_addr);
     uint64_t *_blob_start;
@@ -126,7 +124,7 @@ void __init microcode_scan_module(
         if ( !test_bit(i, module_map) )
             continue;
 
-        _blob_start = bootmap(&mod[i]);
+        _blob_start = bootstrap_map(&mod[i]);
         _blob_size = mod[i].mod_end;
         if ( !_blob_start )
         {
@@ -157,18 +155,17 @@ void __init microcode_scan_module(
                 else
                     memcpy(ucode_blob.data, cd.data, cd.size);
         }
-        bootmap(NULL);
+        bootstrap_map(NULL);
         if ( cd.data )
             break;
     }
     return;
 err:
-    bootmap(NULL);
+    bootstrap_map(NULL);
 }
 void __init microcode_grab_module(
     unsigned long *module_map,
-    const multiboot_info_t *mbi,
-    void *(*map)(const module_t *))
+    const multiboot_info_t *mbi)
 {
     module_t *mod = (module_t *)__va(mbi->mods_addr);
 
@@ -178,10 +175,9 @@ void __init microcode_grab_module(
          !__test_and_clear_bit(ucode_mod_idx, module_map) )
         goto scan;
     ucode_mod = mod[ucode_mod_idx];
-    ucode_mod_map = map;
 scan:
     if ( ucode_scan )
-        microcode_scan_module(module_map, mbi, map);
+        microcode_scan_module(module_map, mbi);
 }
 
 const struct microcode_ops *microcode_ops;
@@ -358,7 +354,7 @@ static int __init microcode_init(void)
     }
     else if ( ucode_mod.mod_end )
     {
-        ucode_mod_map(NULL);
+        bootstrap_map(NULL);
         ucode_mod.mod_end = 0;
     }
 
@@ -399,7 +395,7 @@ int __init early_microcode_update_cpu(bool start_update)
     else if ( ucode_mod.mod_end )
     {
         len = ucode_mod.mod_end;
-        data = ucode_mod_map(&ucode_mod);
+        data = bootstrap_map(&ucode_mod);
     }
     if ( data )
     {

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 5c5c64396239c5dc888ccca7b2f60d028b18a213..65170fe54c8161437a4e2c2822de936be4e5dbae 100644 (file)
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1473,7 +1473,7 @@ void __init noreturn __start_xen(unsigned long mbi_p)
 
     xsm_multiboot_init(module_map, mbi);
 
-    microcode_grab_module(module_map, mbi, bootstrap_map);
+    microcode_grab_module(module_map, mbi);
 
     timer_init();
 

diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h
index 46e9ca69204594ec770a31e98c34df9330ffd652..05d647d02e20a1fd960a971c1896503b4547d49a 100644 (file)
--- a/xen/include/asm-x86/setup.h
+++ b/xen/include/asm-x86/setup.h
@@ -50,7 +50,7 @@ unsigned int dom0_max_vcpus(void);
 int xen_in_range(unsigned long mfn);
 
 void microcode_grab_module(
-    unsigned long *, const multiboot_info_t *, void *(*)(const module_t *));
+    unsigned long *, const multiboot_info_t *);
 
 extern uint8_t kbd_shift_flags;