diff options
| -rw-r--r-- | arch/x86/include/asm/microcode.h | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/microcode_amd.c | 24 |
2 files changed, 24 insertions, 1 deletions
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index 24215072d0e1..472459c2f627 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -61,4 +61,5 @@ static inline struct microcode_ops * __init init_amd_microcode(void) } #endif +extern bool check_current_patch_level(u32 *rev); #endif /* _ASM_X86_MICROCODE_H */ diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c index f9b9eaa3bbe5..be7c43bb8807 100644 --- a/arch/x86/kernel/microcode_amd.c +++ b/arch/x86/kernel/microcode_amd.c @@ -123,13 +123,32 @@ static int get_matching_microcode(int cpu, struct microcode_header_amd *mc_hdr, return 1; } +/* + * Check the current patch level on this CPU. + * + * @rev: Use it to return the patch level. It is set to 0 in the case of + * error. + * + * Returns: + * - true: if update should stop + * - false: otherwise + */ +bool check_current_patch_level(u32 *rev) +{ + u32 dummy; + + rdmsr(MSR_AMD64_PATCH_LEVEL, *rev, dummy); + + return false; +} + static int apply_microcode_amd(int cpu) { - u32 rev, dummy; int cpu_num = raw_smp_processor_id(); struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; struct microcode_amd *mc_amd = uci->mc; struct cpuinfo_x86 *c = &cpu_data(cpu); + u32 dummy, rev; /* We should bind the task to the CPU */ BUG_ON(cpu_num != cpu); @@ -137,6 +156,9 @@ static int apply_microcode_amd(int cpu) if (mc_amd == NULL) return 0; + if (check_current_patch_level(&rev)) + return -1; + wrmsrl(MSR_AMD64_PATCH_LOADER, (u64)(long)&mc_amd->hdr.data_code); /* get patch id after patching */ rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy); |