diff options
| author | Borislav Petkov <bp@suse.de> | 2016-06-06 11:10:47 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-08 05:04:20 -0400 |
| commit | 9198251af1554c21fae8e43a940a8bed435ee1b3 (patch) | |
| tree | b1139bd4886b24714e5d313cb4cafd35343b9185 /arch/x86/kernel/cpu/microcode | |
| parent | fa6788b8c681ffe0a1bf9f99dddc2c447069241c (diff) | |
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: Borislav 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.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/intel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index d852ca984f87..b5759a3f0aa8 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c | |||
| @@ -58,7 +58,7 @@ static struct ucode_blobs { | |||
| 58 | } blobs; | 58 | } blobs; |
| 59 | 59 | ||
| 60 | static enum ucode_state | 60 | static enum ucode_state |
| 61 | load_microcode_early(struct microcode_intel **saved, | 61 | find_microcode_patch(struct microcode_intel **saved, |
| 62 | unsigned int num_saved, struct ucode_cpu_info *uci) | 62 | unsigned int num_saved, struct ucode_cpu_info *uci) |
| 63 | { | 63 | { |
| 64 | struct microcode_intel *ucode_ptr, *new_mc = NULL; | 64 | struct microcode_intel *ucode_ptr, *new_mc = NULL; |
| @@ -127,13 +127,13 @@ load_microcode(struct mc_saved_data *mcs, unsigned long *mc_ptrs, | |||
| 127 | if (!mcs->mc_saved) { | 127 | if (!mcs->mc_saved) { |
| 128 | copy_ptrs(mc_saved_tmp, mc_ptrs, offset, count); | 128 | copy_ptrs(mc_saved_tmp, mc_ptrs, offset, count); |
| 129 | 129 | ||
| 130 | return load_microcode_early(mc_saved_tmp, count, uci); | 130 | return find_microcode_patch(mc_saved_tmp, count, uci); |
| 131 | } else { | 131 | } else { |
| 132 | #ifdef CONFIG_X86_32 | 132 | #ifdef CONFIG_X86_32 |
| 133 | microcode_phys(mc_saved_tmp, mcs); | 133 | microcode_phys(mc_saved_tmp, mcs); |
| 134 | return load_microcode_early(mc_saved_tmp, count, uci); | 134 | return find_microcode_patch(mc_saved_tmp, count, uci); |
| 135 | #else | 135 | #else |
| 136 | return load_microcode_early(mcs->mc_saved, count, uci); | 136 | return find_microcode_patch(mcs->mc_saved, count, uci); |
| 137 | #endif | 137 | #endif |
| 138 | } | 138 | } |
| 139 | } | 139 | } |
| @@ -834,7 +834,7 @@ void reload_ucode_intel(void) | |||
| 834 | 834 | ||
| 835 | collect_cpu_info_early(&uci); | 835 | collect_cpu_info_early(&uci); |
| 836 | 836 | ||
| 837 | ret = load_microcode_early(mc_saved_data.mc_saved, | 837 | ret = find_microcode_patch(mc_saved_data.mc_saved, |
| 838 | mc_saved_data.num_saved, &uci); | 838 | mc_saved_data.num_saved, &uci); |
| 839 | if (ret != UCODE_OK) | 839 | if (ret != UCODE_OK) |
| 840 | return; | 840 | return; |
