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

Commit e913b8cd authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'microcode_fixes_for_3.19' of... 

Merge tag 'microcode_fixes_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

 into x86/microcode

Pull x86 microcode fixes from Borislav Petkov:

  "Reload microcode when resuming and the case when only the early loader
   has been utilized.

   Also, do not load the driver on paravirt guests, from Boris Ostrovsky."

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2ef84b3b fbae4ba8

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

+2 −0
Original line number Diff line number Diff line
@@ -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_early.c

+18 −0
Original line number Diff line number Diff line
@@ -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);

		}

	}

}

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

+2 −8
Original line number Diff line number Diff line
@@ -466,13 +466,7 @@ static void mc_bp_resume(void) 
	if (uci->valid && uci->mc)

		microcode_ops->apply_microcode(cpu);

	else if (!uci->mc)

		/*

		 * We might resume and not have applied late microcode but still

		 * have a newer patch stashed from the early loader. We don't

		 * have it in uci->mc so we have to load it the same way we're

		 * applying patches early on the APs.

		 */

		load_ucode_ap();

		reload_early_microcode();

}



static struct syscore_ops mc_syscore_ops = {
@@ -557,7 +551,7 @@ static int __init microcode_init(void) 
	struct cpuinfo_x86 *c = &cpu_data(0);

	int error;



	if (dis_ucode_ldr)

	if (paravirt_enabled() || dis_ucode_ldr)

		return 0;



	if (c->x86_vendor == X86_VENDOR_INTEL)