leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86, microcode, AMD: Simplify get_next_ucode

Browse Source 
Do not copy the section header but look at it directly through the
pointer. Also, make it return a ptr to a ucode header directly
thus dropping a bunch of unneeded casts. Finally, simplify
generic_load_microcode(), while at it.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Acked-by: Andreas Herrmann <Andreas.Herrmann3@amd.com>
This commit is contained in:
Borislav Petkov 2010-12-31 16:57:48 +01:00
parent 10de52d665
commit 7cc27349cb
1 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
arch/x86/kernel/microcode_amd.c
View File

@ -88,9 +88,9 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)
return 0;
}
static int get_matching_microcode(int cpu, void *mc, int rev)
static int get_matching_microcode(int cpu, struct microcode_header_amd *mc_hdr,
int rev)
{
struct microcode_header_amd *mc_header = mc;
unsigned int current_cpu_id;
u16 equiv_cpu_id = 0;
unsigned int i = 0;
@ -109,17 +109,17 @@ static int get_matching_microcode(int cpu, void *mc, int rev)
if (!equiv_cpu_id)
return 0;
if (mc_header->processor_rev_id != equiv_cpu_id)
if (mc_hdr->processor_rev_id != equiv_cpu_id)
return 0;
/* ucode might be chipset specific -- currently we don't support this */
if (mc_header->nb_dev_id || mc_header->sb_dev_id) {
if (mc_hdr->nb_dev_id || mc_hdr->sb_dev_id) {
pr_err("CPU%d: loading of chipset specific code not yet supported\n",
cpu);
return 0;
}
if (mc_header->patch_id <= rev)
if (mc_hdr->patch_id <= rev)
return 0;
return 1;
@ -155,21 +155,18 @@ static int apply_microcode_amd(int cpu)
return 0;
}
static void *
static struct microcode_header_amd *
get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)
{
struct microcode_header_amd *mc;
unsigned int total_size;
u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
void *mc;
get_ucode_data(section_hdr, buf, UCODE_CONTAINER_SECTION_HDR);
if (section_hdr[0] != UCODE_UCODE_TYPE) {
if (buf[0] != UCODE_UCODE_TYPE) {
pr_err("error: invalid type field in container file section header\n");
return NULL;
}
total_size = (unsigned long) (section_hdr[4] + (section_hdr[5] << 8));
total_size = buf[4] + (buf[5] << 8);
if (total_size > size || total_size > UCODE_MAX_SIZE) {
pr_err("error: size mismatch\n");
@ -218,12 +215,12 @@ static enum ucode_state
generic_load_microcode(int cpu, const u8 *data, size_t size)
{
struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
struct microcode_header_amd *mc_hdr = NULL;
unsigned int mc_size, leftover;
unsigned long offset;
const u8 *ucode_ptr = data;
void *new_mc = NULL;
void *mc;
int new_rev = uci->cpu_sig.rev;
unsigned int leftover;
unsigned long offset;
enum ucode_state state = UCODE_OK;
offset = install_equiv_cpu_table(ucode_ptr);
@ -236,38 +233,37 @@ generic_load_microcode(int cpu, const u8 *data, size_t size)
leftover = size - offset;
while (leftover) {
unsigned int uninitialized_var(mc_size);
struct microcode_header_amd *mc_header;
mc = get_next_ucode(ucode_ptr, leftover, &mc_size);
if (!mc)
mc_hdr = get_next_ucode(ucode_ptr, leftover, &mc_size);
if (!mc_hdr)
break;
mc_header = (struct microcode_header_amd *)mc;
if (get_matching_microcode(cpu, mc, new_rev)) {
if (get_matching_microcode(cpu, mc_hdr, new_rev)) {
vfree(new_mc);
new_rev = mc_header->patch_id;
new_mc = mc;
new_rev = mc_hdr->patch_id;
new_mc = mc_hdr;
} else
vfree(mc);
vfree(mc_hdr);
ucode_ptr += mc_size;
leftover -= mc_size;
}
if (new_mc) {
if (!leftover) {
vfree(uci->mc);
uci->mc = new_mc;
pr_debug("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n",
cpu, new_rev, uci->cpu_sig.rev);
} else {
vfree(new_mc);
state = UCODE_ERROR;
}
} else
if (!new_mc) {
state = UCODE_NFOUND;
goto free_table;
}
if (!leftover) {
vfree(uci->mc);
uci->mc = new_mc;
pr_debug("CPU%d update ucode to version 0x%x (from 0x%x)\n",
cpu, new_rev, uci->cpu_sig.rev);
} else {
vfree(new_mc);
state = UCODE_ERROR;
}
free_table:
free_equiv_cpu_table();
return state;