Skip to content

Commit a5ad921

Browse files
committed
x86/microcode/AMD: Add a @cpu parameter to the reloading functions
Will be used in a subsequent change. Signed-off-by: Borislav Petkov (AMD) <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 2355370 commit a5ad921

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

arch/x86/include/asm/microcode.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ static inline unsigned int x86_cpuid_family(void)
125125
#ifdef CONFIG_MICROCODE
126126
extern void __init load_ucode_bsp(void);
127127
extern void load_ucode_ap(void);
128-
void reload_early_microcode(void);
128+
void reload_early_microcode(unsigned int cpu);
129129
extern bool initrd_gone;
130130
void microcode_bsp_resume(void);
131131
#else
132132
static inline void __init load_ucode_bsp(void) { }
133133
static inline void load_ucode_ap(void) { }
134-
static inline void reload_early_microcode(void) { }
134+
static inline void reload_early_microcode(unsigned int cpu) { }
135135
static inline void microcode_bsp_resume(void) { }
136136
#endif
137137

arch/x86/include/asm/microcode_amd.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ struct microcode_amd {
4747
extern void __init load_ucode_amd_bsp(unsigned int family);
4848
extern void load_ucode_amd_ap(unsigned int family);
4949
extern int __init save_microcode_in_initrd_amd(unsigned int family);
50-
void reload_ucode_amd(void);
50+
void reload_ucode_amd(unsigned int cpu);
5151
#else
5252
static inline void __init load_ucode_amd_bsp(unsigned int family) {}
5353
static inline void load_ucode_amd_ap(unsigned int family) {}
5454
static inline int __init
5555
save_microcode_in_initrd_amd(unsigned int family) { return -EINVAL; }
56-
static inline void reload_ucode_amd(void) {}
56+
static inline void reload_ucode_amd(unsigned int cpu) {}
5757
#endif
5858
#endif /* _ASM_X86_MICROCODE_AMD_H */

arch/x86/kernel/cpu/microcode/amd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)
578578
return 0;
579579
}
580580

581-
void reload_ucode_amd(void)
581+
void reload_ucode_amd(unsigned int cpu)
582582
{
583583
struct microcode_amd *mc;
584584
u32 rev, dummy __always_unused;

arch/x86/kernel/cpu/microcode/core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ struct cpio_data find_microcode_in_initrd(const char *path, bool use_pa)
298298
#endif
299299
}
300300

301-
void reload_early_microcode(void)
301+
void reload_early_microcode(unsigned int cpu)
302302
{
303303
int vendor, family;
304304

@@ -312,7 +312,7 @@ void reload_early_microcode(void)
312312
break;
313313
case X86_VENDOR_AMD:
314314
if (family >= 0x10)
315-
reload_ucode_amd();
315+
reload_ucode_amd(cpu);
316316
break;
317317
default:
318318
break;
@@ -564,7 +564,7 @@ void microcode_bsp_resume(void)
564564
if (uci->mc)
565565
microcode_ops->apply_microcode(cpu);
566566
else
567-
reload_early_microcode();
567+
reload_early_microcode(cpu);
568568
}
569569

570570
static struct syscore_ops mc_syscore_ops = {

0 commit comments

Comments
 (0)