evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reload microcode when resuming and the case when only the early loader

Browse source 
has been utilized.
 
 Also, do not load the driver on paravirt guests, from Boris Ostrovsky.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUgx3CAAoJEBLB8Bhh3lVKoYMQAIcuRAUhNnuLBxkmwQYKJdIA
 XzMKeOCHC8I5c/ZE1662l18DIBUyIhG2W3LrSyr7XF2jF82nNoJjmELJ7Mq+k3uT
 K6izFukhzL2MPp/n9RaKLxN1c4IRwrtGbrJrqzF/2aWoLJZeFBeEKRk9J0tSM2ZU
 7TFNwvuee6jQDt5iRhAso/xn1ps+6BcsDohZ27BA1lR1TFJc3vQf2DajcmivYP+I
 UJ2xNsfaFqrF/DZhNc+DjR74lFXGmf0HNhIwInDBILx2+H5eGhZnel8e5T5HxCE7
 dVk6KD3WYz20BD0zBDpeuQdrepRV14TInYarBPAr/HJxrDu1En7mTNs7ZKFdYmse
 y9rlVCNKpbrF3KCW0UKhtJk/O56UJtNEy789bPU4FtPw0YqKbkR0ld26A/TsPRpk
 ipQZ4q0rmkAf+H/Ktkk0D5Wsr2wMqCYQQKtpBu3GgWBbsjSSFnujGSagkhNgd3Ec
 0s1xzTgm01XiX/g2qBwRiYI3E3kjYn21o+2rudxJwsV+h4+iz48PqB4SehEi5wAT
 RtARbBDtGTbZxpY8X8p3cqMNLkVGwIsGtWOuvm9kbs/e6VXaRuUOSEg3teb/O/Nw
 Nno0Mn3pZVRqxbA2o9sxh2PpYTEKWtJZaLJfeJfL5BaDSUfTH/0PMH66jmViQwbX
 v6DZMTcf/CBbF2BE3FAr
 =tBMw
 -----END PGP SIGNATURE-----

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: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2014-12-08 10:26:29 +01:00
commit e913b8cd45
7 changed files with 85 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/include/asm/microcode.h
View file

@ -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 */

2
arch/x86/include/asm/microcode_amd.h
View file

@ -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 */

2
arch/x86/include/asm/microcode_intel.h
View file

@ -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)

18
arch/x86/kernel/cpu/microcode/amd_early.c
View file

@ -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);
}
}
}

10
arch/x86/kernel/cpu/microcode/core.c
View file

@ -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)

21
arch/x86/kernel/cpu/microcode/core_early.c
View file

@ -176,3 +176,24 @@ int __init save_microcode_in_initrd(void)
return 0;
}
void reload_early_microcode(void)
{
int vendor, x86;
vendor = x86_vendor();
x86 = x86_family();
switch (vendor) {
case X86_VENDOR_INTEL:
if (x86 >= 6)
reload_ucode_intel();
break;
case X86_VENDOR_AMD:
if (x86 >= 0x10)
reload_ucode_amd();
break;
default:
break;
}
}

44
arch/x86/kernel/cpu/microcode/intel_early.c
View file

@ -34,6 +34,8 @@ static struct mc_saved_data {
struct microcode_intel **mc_saved;
} mc_saved_data;
static struct microcode_intel bsp_patch;
static enum ucode_state
generic_load_microcode_early(struct microcode_intel **mc_saved_p,
unsigned int mc_saved_count,
@ -650,8 +652,7 @@ static inline void print_ucode(struct ucode_cpu_info *uci)
}
#endif
static int apply_microcode_early(struct mc_saved_data *mc_saved_data,
struct ucode_cpu_info *uci)
static int apply_microcode_early(struct ucode_cpu_info *uci, bool early)
{
struct microcode_intel *mc_intel;
unsigned int val[2];
@ -680,7 +681,10 @@ static int apply_microcode_early(struct mc_saved_data *mc_saved_data,
#endif
uci->cpu_sig.rev = val[1];
if (early)
print_ucode(uci);
else
print_ucode_info(uci, mc_intel->hdr.date);
return 0;
}
@ -713,14 +717,22 @@ _load_ucode_intel_bsp(struct mc_saved_data *mc_saved_data,
unsigned long *mc_saved_in_initrd,
unsigned long initrd_start_early,
unsigned long initrd_end_early,
struct ucode_cpu_info *uci)
struct ucode_cpu_info *uci,
struct microcode_intel *bsp)
{
enum ucode_state ret;
collect_cpu_info_early(uci);
scan_microcode(initrd_start_early, initrd_end_early, mc_saved_data,
mc_saved_in_initrd, uci);
load_microcode(mc_saved_data, mc_saved_in_initrd,
ret = load_microcode(mc_saved_data, mc_saved_in_initrd,
initrd_start_early, uci);
apply_microcode_early(mc_saved_data, uci);
if (ret == UCODE_OK) {
apply_microcode_early(uci, true);
memcpy(bsp, uci->mc, sizeof(*bsp));
}
}
void __init
@ -729,10 +741,12 @@ load_ucode_intel_bsp(void)
u64 ramdisk_image, ramdisk_size;
unsigned long initrd_start_early, initrd_end_early;
struct ucode_cpu_info uci;
struct microcode_intel *bsp_p;
#ifdef CONFIG_X86_32
struct boot_params *boot_params_p;
boot_params_p = (struct boot_params *)__pa_nodebug(&boot_params);
bsp_p = (struct microcode_intel *)__pa_nodebug(&bsp_patch);
ramdisk_image = boot_params_p->hdr.ramdisk_image;
ramdisk_size = boot_params_p->hdr.ramdisk_size;
initrd_start_early = ramdisk_image;
@ -741,15 +755,17 @@ load_ucode_intel_bsp(void)
_load_ucode_intel_bsp(
(struct mc_saved_data *)__pa_nodebug(&mc_saved_data),
(unsigned long *)__pa_nodebug(&mc_saved_in_initrd),
initrd_start_early, initrd_end_early, &uci);
initrd_start_early, initrd_end_early, &uci, bsp_p);
#else
bsp_p = &bsp_patch;
ramdisk_image = boot_params.hdr.ramdisk_image;
ramdisk_size = boot_params.hdr.ramdisk_size;
initrd_start_early = ramdisk_image + PAGE_OFFSET;
initrd_end_early = initrd_start_early + ramdisk_size;
_load_ucode_intel_bsp(&mc_saved_data, mc_saved_in_initrd,
initrd_start_early, initrd_end_early, &uci);
initrd_start_early, initrd_end_early,
&uci, bsp_p);
#endif
}
@ -783,5 +799,17 @@ void load_ucode_intel_ap(void)
collect_cpu_info_early(&uci);
load_microcode(mc_saved_data_p, mc_saved_in_initrd_p,
initrd_start_addr, &uci);
apply_microcode_early(mc_saved_data_p, &uci);
apply_microcode_early(&uci, true);
}
void reload_ucode_intel(void)
{
struct ucode_cpu_info uci;
if (!bsp_patch.hdr.rev)
return;
uci.mc = &bsp_patch;
apply_microcode_early(&uci, false);
}