Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 21:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86/microcode/amd: Hand down the CPU family

Browse Source 
Will be needed in a following patch.

No functionality change.

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20161025095522.11964-7-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Borislav Petkov 2016-10-25 11:55:16 +02:00 committed by Ingo Molnar
parent 058dc49803
commit b3763a672d
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/include/asm/microcode_amd.h
View File

@ -65,13 +65,14 @@ extern enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, s
#ifdef CONFIG_MICROCODE_AMD #ifdef CONFIG_MICROCODE_AMD
extern void __init load_ucode_amd_bsp(unsigned int family); extern void __init load_ucode_amd_bsp(unsigned int family);
extern void load_ucode_amd_ap(void); extern void load_ucode_amd_ap(unsigned int family);
extern int __init save_microcode_in_initrd_amd(void); extern int __init save_microcode_in_initrd_amd(unsigned int family);
void reload_ucode_amd(void); void reload_ucode_amd(void);
#else #else
static inline void __init load_ucode_amd_bsp(unsigned int family) {} static inline void __init load_ucode_amd_bsp(unsigned int family) {}
static inline void load_ucode_amd_ap(void) {} static inline void load_ucode_amd_ap(unsigned int family) {}
static inline int __init save_microcode_in_initrd_amd(void) { return -EINVAL; } static inline int __init
save_microcode_in_initrd_amd(unsigned int family) { return -EINVAL; }
void reload_ucode_amd(void) {} void reload_ucode_amd(void) {}
#endif #endif

6
arch/x86/kernel/cpu/microcode/amd.c
View File

@ -308,7 +308,7 @@ void __init load_ucode_amd_bsp(unsigned int family)
* In save_microcode_in_initrd_amd() BSP's patch is copied to amd_ucode_patch, * In save_microcode_in_initrd_amd() BSP's patch is copied to amd_ucode_patch,
* which is used upon resume from suspend. * which is used upon resume from suspend.
*/ */
void load_ucode_amd_ap(void) void load_ucode_amd_ap(unsigned int family)
{ {
struct microcode_amd *mc; struct microcode_amd *mc;
size_t *usize; size_t *usize;
@ -346,7 +346,7 @@ static void __init get_bsp_sig(void)
smp_call_function_single(bsp, collect_cpu_sig_on_bsp, NULL, 1); smp_call_function_single(bsp, collect_cpu_sig_on_bsp, NULL, 1);
} }
#else #else
void load_ucode_amd_ap(void) void load_ucode_amd_ap(unsigned int family)
{ {
struct equiv_cpu_entry *eq; struct equiv_cpu_entry *eq;
struct microcode_amd *mc; struct microcode_amd *mc;
@ -395,7 +395,7 @@ void load_ucode_amd_ap(void)
} }
#endif #endif
int __init save_microcode_in_initrd_amd(void) int __init save_microcode_in_initrd_amd(unsigned int family)
{ {
unsigned long cont; unsigned long cont;
int retval = 0; int retval = 0;

4
arch/x86/kernel/cpu/microcode/core.c
View File

@ -169,7 +169,7 @@ void load_ucode_ap(void)
break; break;
case X86_VENDOR_AMD: case X86_VENDOR_AMD:
if (family >= 0x10) if (family >= 0x10)
load_ucode_amd_ap(); load_ucode_amd_ap(family);
break; break;
default: default:
break; break;
@ -187,7 +187,7 @@ static int __init save_microcode_in_initrd(void)
break; break;
case X86_VENDOR_AMD: case X86_VENDOR_AMD:
if (c->x86 >= 0x10) if (c->x86 >= 0x10)
return save_microcode_in_initrd_amd(); return save_microcode_in_initrd_amd(c->x86);
break; break;
default: default:
break; break;