提交 9198251a 编写于 作者: B Borislav Petkov 提交者: Ingo Molnar

x86/microcode/intel: Rename load_microcode_early() to find_microcode_patch()

This function does exactly that: it goes through the previously saved
array of microcode blobs and finds the proper one for the current CPU.
Rename it accordingly.

No functionality change.
Signed-off-by: NBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1465225850-7352-7-git-send-email-bp@alien8.deSigned-off-by: NIngo Molnar <mingo@kernel.org>
上级 fa6788b8
...@@ -58,7 +58,7 @@ static struct ucode_blobs { ...@@ -58,7 +58,7 @@ static struct ucode_blobs {
} blobs; } blobs;
static enum ucode_state static enum ucode_state
load_microcode_early(struct microcode_intel **saved, find_microcode_patch(struct microcode_intel **saved,
unsigned int num_saved, struct ucode_cpu_info *uci) unsigned int num_saved, struct ucode_cpu_info *uci)
{ {
struct microcode_intel *ucode_ptr, *new_mc = NULL; struct microcode_intel *ucode_ptr, *new_mc = NULL;
...@@ -127,13 +127,13 @@ load_microcode(struct mc_saved_data *mcs, unsigned long *mc_ptrs, ...@@ -127,13 +127,13 @@ load_microcode(struct mc_saved_data *mcs, unsigned long *mc_ptrs,
if (!mcs->mc_saved) { if (!mcs->mc_saved) {
copy_ptrs(mc_saved_tmp, mc_ptrs, offset, count); copy_ptrs(mc_saved_tmp, mc_ptrs, offset, count);
return load_microcode_early(mc_saved_tmp, count, uci); return find_microcode_patch(mc_saved_tmp, count, uci);
} else { } else {
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
microcode_phys(mc_saved_tmp, mcs); microcode_phys(mc_saved_tmp, mcs);
return load_microcode_early(mc_saved_tmp, count, uci); return find_microcode_patch(mc_saved_tmp, count, uci);
#else #else
return load_microcode_early(mcs->mc_saved, count, uci); return find_microcode_patch(mcs->mc_saved, count, uci);
#endif #endif
} }
} }
...@@ -834,7 +834,7 @@ void reload_ucode_intel(void) ...@@ -834,7 +834,7 @@ void reload_ucode_intel(void)
collect_cpu_info_early(&uci); collect_cpu_info_early(&uci);
ret = load_microcode_early(mc_saved_data.mc_saved, ret = find_microcode_patch(mc_saved_data.mc_saved,
mc_saved_data.num_saved, &uci); mc_saved_data.num_saved, &uci);
if (ret != UCODE_OK) if (ret != UCODE_OK)
return; return;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册