Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 727bc2c2 authored by Borislav Petkov (AMD)'s avatar Borislav Petkov (AMD) Committed by Greg Kroah-Hartman
Browse files

x86/microcode/AMD: Add a @cpu parameter to the reloading functions 



commit a5ad92134bd153a9ccdcddf09a95b088f36c3cce upstream.

Will be used in a subsequent change.

Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230130161709.11615-3-bp@alien8.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4c26edf2

arch/x86/include/asm/microcode.h

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static inline unsigned int x86_cpuid_family(void) 
int __init microcode_init(void);

extern void __init load_ucode_bsp(void);

extern void load_ucode_ap(void);

void reload_early_microcode(void);

void reload_early_microcode(unsigned int cpu);

extern bool get_builtin_firmware(struct cpio_data *cd, const char *name);

extern bool initrd_gone;

void microcode_bsp_resume(void);
@@ -139,7 +139,7 @@ void microcode_bsp_resume(void); 
static inline int __init microcode_init(void)			{ return 0; };

static inline void __init load_ucode_bsp(void)			{ }

static inline void load_ucode_ap(void)				{ }

static inline void reload_early_microcode(void)			{ }

static inline void reload_early_microcode(unsigned int cpu)	{ }

static inline void microcode_bsp_resume(void)			{ }

static inline bool

get_builtin_firmware(struct cpio_data *cd, const char *name)	{ return false; }

arch/x86/include/asm/microcode_amd.h

+2 −2
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@ struct microcode_amd { 
extern void __init load_ucode_amd_bsp(unsigned int family);

extern void load_ucode_amd_ap(unsigned int family);

extern int __init save_microcode_in_initrd_amd(unsigned int family);

void reload_ucode_amd(void);

void reload_ucode_amd(unsigned int cpu);

#else

static inline void __init load_ucode_amd_bsp(unsigned int family) {}

static inline void load_ucode_amd_ap(unsigned int family) {}

static inline int __init

save_microcode_in_initrd_amd(unsigned int family) { return -EINVAL; }

void reload_ucode_amd(void) {}

static inline void reload_ucode_amd(unsigned int cpu) {}

#endif

#endif /* _ASM_X86_MICROCODE_AMD_H */

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

+1 −1
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax) 
	return 0;

}



void reload_ucode_amd(void)

void reload_ucode_amd(unsigned int cpu)

{

	struct microcode_amd *mc;

	u32 rev, dummy;

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

+3 −3
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ struct cpio_data find_microcode_in_initrd(const char *path, bool use_pa) 
#endif

}



void reload_early_microcode(void)

void reload_early_microcode(unsigned int cpu)

{

	int vendor, family;
@@ -336,7 +336,7 @@ void reload_early_microcode(void) 
		break;

	case X86_VENDOR_AMD:

		if (family >= 0x10)

			reload_ucode_amd();

			reload_ucode_amd(cpu);

		break;

	default:

		break;
@@ -782,7 +782,7 @@ void microcode_bsp_resume(void) 
	if (uci->valid && uci->mc)

		microcode_ops->apply_microcode(cpu);

	else if (!uci->mc)

		reload_early_microcode();

		reload_early_microcode(cpu);

}



static struct syscore_ops mc_syscore_ops = {