diff options
| author | Borislav Petkov <bp@suse.de> | 2015-02-10 04:56:37 -0500 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2015-03-02 14:32:10 -0500 |
| commit | 9e02bb46d366b3635da966e29c5a53920ee7fde8 (patch) | |
| tree | 23a3fb9cbeaccbc286d08c62e258e15479fea41c /arch/x86/kernel/cpu/microcode | |
| parent | 58ce8d6d3a7616014dc70fd8d8f945176d74957c (diff) | |
x86/microcode/intel: Simplify generic_load_microcode_early()
* remove state variable and out label
* get rid of completely unused mc_size
* shorten variable names
* get rid of local variables
* don't do assignments in local var declarations for less cluttered code
* finally rename it to the shorter and perfectly fine load_microcode_early()
No functionality change.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/intel_early.c | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/arch/x86/kernel/cpu/microcode/intel_early.c b/arch/x86/kernel/cpu/microcode/intel_early.c index 5c7896bf0e4d..d7192124f50b 100644 --- a/arch/x86/kernel/cpu/microcode/intel_early.c +++ b/arch/x86/kernel/cpu/microcode/intel_early.c | |||
| @@ -35,38 +35,35 @@ static struct mc_saved_data { | |||
| 35 | } mc_saved_data; | 35 | } mc_saved_data; |
| 36 | 36 | ||
| 37 | static enum ucode_state | 37 | static enum ucode_state |
| 38 | generic_load_microcode_early(struct microcode_intel **mc_saved_p, | 38 | load_microcode_early(struct microcode_intel **saved, |
| 39 | unsigned int mc_saved_count, | 39 | unsigned int num_saved, struct ucode_cpu_info *uci) |
| 40 | struct ucode_cpu_info *uci) | ||
| 41 | { | 40 | { |
| 42 | struct microcode_intel *ucode_ptr, *new_mc = NULL; | 41 | struct microcode_intel *ucode_ptr, *new_mc = NULL; |
| 43 | int new_rev = uci->cpu_sig.rev; | 42 | struct microcode_header_intel *mc_hdr; |
| 44 | enum ucode_state state = UCODE_OK; | 43 | int new_rev, ret, i; |
| 45 | unsigned int mc_size; | ||
| 46 | struct microcode_header_intel *mc_header; | ||
| 47 | unsigned int csig = uci->cpu_sig.sig; | ||
| 48 | unsigned int cpf = uci->cpu_sig.pf; | ||
| 49 | int i; | ||
| 50 | 44 | ||
| 51 | for (i = 0; i < mc_saved_count; i++) { | 45 | new_rev = uci->cpu_sig.rev; |
| 52 | ucode_ptr = mc_saved_p[i]; | ||
| 53 | 46 | ||
| 54 | mc_header = (struct microcode_header_intel *)ucode_ptr; | 47 | for (i = 0; i < num_saved; i++) { |
| 55 | mc_size = get_totalsize(mc_header); | 48 | ucode_ptr = saved[i]; |
| 56 | if (get_matching_microcode(csig, cpf, ucode_ptr, new_rev)) { | 49 | mc_hdr = (struct microcode_header_intel *)ucode_ptr; |
| 57 | new_rev = mc_header->rev; | 50 | |
| 58 | new_mc = ucode_ptr; | 51 | ret = get_matching_microcode(uci->cpu_sig.sig, |
| 59 | } | 52 | uci->cpu_sig.pf, |
| 60 | } | 53 | ucode_ptr, |
| 54 | new_rev); | ||
| 55 | if (!ret) | ||
| 56 | continue; | ||
| 61 | 57 | ||
| 62 | if (!new_mc) { | 58 | new_rev = mc_hdr->rev; |
| 63 | state = UCODE_NFOUND; | 59 | new_mc = ucode_ptr; |
| 64 | goto out; | ||
| 65 | } | 60 | } |
| 66 | 61 | ||
| 62 | if (!new_mc) | ||
| 63 | return UCODE_NFOUND; | ||
| 64 | |||
| 67 | uci->mc = (struct microcode_intel *)new_mc; | 65 | uci->mc = (struct microcode_intel *)new_mc; |
| 68 | out: | 66 | return UCODE_OK; |
| 69 | return state; | ||
| 70 | } | 67 | } |
| 71 | 68 | ||
| 72 | static void | 69 | static void |
| @@ -114,13 +111,13 @@ load_microcode(struct mc_saved_data *mc_saved_data, | |||
| 114 | microcode_pointer(mc_saved_tmp, mc_saved_in_initrd, | 111 | microcode_pointer(mc_saved_tmp, mc_saved_in_initrd, |
| 115 | initrd_start, count); | 112 | initrd_start, count); |
| 116 | 113 | ||
| 117 | return generic_load_microcode_early(mc_saved_tmp, count, uci); | 114 | return load_microcode_early(mc_saved_tmp, count, uci); |
| 118 | } else { | 115 | } else { |
| 119 | #ifdef CONFIG_X86_32 | 116 | #ifdef CONFIG_X86_32 |
| 120 | microcode_phys(mc_saved_tmp, mc_saved_data); | 117 | microcode_phys(mc_saved_tmp, mc_saved_data); |
| 121 | return generic_load_microcode_early(mc_saved_tmp, count, uci); | 118 | return load_microcode_early(mc_saved_tmp, count, uci); |
| 122 | #else | 119 | #else |
| 123 | return generic_load_microcode_early(mc_saved_data->mc_saved, | 120 | return load_microcode_early(mc_saved_data->mc_saved, |
| 124 | count, uci); | 121 | count, uci); |
| 125 | #endif | 122 | #endif |
| 126 | } | 123 | } |
| @@ -773,8 +770,8 @@ void reload_ucode_intel(void) | |||
| 773 | 770 | ||
| 774 | collect_cpu_info_early(&uci); | 771 | collect_cpu_info_early(&uci); |
| 775 | 772 | ||
| 776 | ret = generic_load_microcode_early(mc_saved_data.mc_saved, | 773 | ret = load_microcode_early(mc_saved_data.mc_saved, |
| 777 | mc_saved_data.mc_saved_count, &uci); | 774 | mc_saved_data.mc_saved_count, &uci); |
| 778 | if (ret != UCODE_OK) | 775 | if (ret != UCODE_OK) |
| 779 | return; | 776 | return; |
| 780 | 777 | ||