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

Commit 3a5dc1fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 microcode loading updates from Ingo Molnar:
 "The main changes in this cycle are:

   - Reload microcode when resuming and the case when only the early
     loader has been utilized.  (Borislav Petkov)

   - Also, do not load the driver on paravirt guests.  (Boris
     Ostrovsky)"

* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode/intel: Fish out the stashed microcode for the BSP
  x86, microcode: Reload microcode on resume
  x86, microcode: Don't initialize microcode code on paravirt
  x86, microcode, intel: Drop unused parameter
  x86, microcode, AMD: Do not use smp_processor_id() in preemtible context
parents 3100e448 25cdb9c8

arch/x86/include/asm/microcode.h

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static inline void __exit exit_amd_microcode(void) {} 
extern void __init load_ucode_bsp(void);

extern void load_ucode_ap(void);

extern int __init save_microcode_in_initrd(void);

void reload_early_microcode(void);

#else

static inline void __init load_ucode_bsp(void) {}

static inline void load_ucode_ap(void) {}
@@ -85,6 +86,7 @@ static inline int __init save_microcode_in_initrd(void) 
{

	return 0;

}

static inline void reload_early_microcode(void) {}

#endif



#endif /* _ASM_X86_MICROCODE_H */

arch/x86/include/asm/microcode_amd.h

+3 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static inline u16 find_equiv_id(struct equiv_cpu_entry *equiv_cpu_table, 


extern int __apply_microcode_amd(struct microcode_amd *mc_amd);

extern int apply_microcode_amd(int cpu);

extern enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size);

extern enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size);



#define PATCH_MAX_SIZE PAGE_SIZE

extern u8 amd_ucode_patch[PATCH_MAX_SIZE];
@@ -68,10 +68,12 @@ extern u8 amd_ucode_patch[PATCH_MAX_SIZE]; 
extern void __init load_ucode_amd_bsp(void);

extern void load_ucode_amd_ap(void);

extern int __init save_microcode_in_initrd_amd(void);

void reload_ucode_amd(void);

#else

static inline void __init load_ucode_amd_bsp(void) {}

static inline void load_ucode_amd_ap(void) {}

static inline int __init save_microcode_in_initrd_amd(void) { return -EINVAL; }

void reload_ucode_amd(void) {}

#endif



#endif /* _ASM_X86_MICROCODE_AMD_H */

arch/x86/include/asm/microcode_intel.h

+2 −0
Original line number Diff line number Diff line
@@ -68,11 +68,13 @@ extern void __init load_ucode_intel_bsp(void); 
extern void load_ucode_intel_ap(void);

extern void show_ucode_info_early(void);

extern int __init save_microcode_in_initrd_intel(void);

void reload_ucode_intel(void);

#else

static inline __init void load_ucode_intel_bsp(void) {}

static inline void load_ucode_intel_ap(void) {}

static inline void show_ucode_info_early(void) {}

static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL; }

static inline void reload_ucode_intel(void) {}

#endif



#if defined(CONFIG_MICROCODE_INTEL_EARLY) && defined(CONFIG_HOTPLUG_CPU)

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

+4 −4
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data, 
	return UCODE_OK;

}



enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size)

enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size)

{

	enum ucode_state ret;
@@ -390,8 +390,8 @@ enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size) 


#if defined(CONFIG_MICROCODE_AMD_EARLY) && defined(CONFIG_X86_32)

	/* save BSP's matching patch for early load */

	if (cpu_data(smp_processor_id()).cpu_index == boot_cpu_data.cpu_index) {

		struct ucode_patch *p = find_patch(smp_processor_id());

	if (cpu_data(cpu).cpu_index == boot_cpu_data.cpu_index) {

		struct ucode_patch *p = find_patch(cpu);

		if (p) {

			memset(amd_ucode_patch, 0, PATCH_MAX_SIZE);

			memcpy(amd_ucode_patch, p->data, min_t(u32, ksize(p->data),
@@ -444,7 +444,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device, 
		goto fw_release;

	}



	ret = load_microcode_amd(c->x86, fw->data, fw->size);

	ret = load_microcode_amd(cpu, c->x86, fw->data, fw->size);



 fw_release:

	release_firmware(fw);

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

+19 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ int __init save_microcode_in_initrd_amd(void) 
	eax   = cpuid_eax(0x00000001);

	eax   = ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff);



	ret = load_microcode_amd(eax, container, container_size);

	ret = load_microcode_amd(smp_processor_id(), eax, container, container_size);

	if (ret != UCODE_OK)

		retval = -EINVAL;
@@ -402,3 +402,21 @@ int __init save_microcode_in_initrd_amd(void) 


	return retval;

}



void reload_ucode_amd(void)

{

	struct microcode_amd *mc;

	u32 rev, eax;



	rdmsr(MSR_AMD64_PATCH_LEVEL, rev, eax);



	mc = (struct microcode_amd *)amd_ucode_patch;



	if (mc && rev < mc->hdr.patch_id) {

		if (!__apply_microcode_amd(mc)) {

			ucode_new_rev = mc->hdr.patch_id;

			pr_info("microcode: reload patch_level=0x%08x\n",

				ucode_new_rev);

		}

	}

}