lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, microcode rework, v2, renaming cont.

Browse Source 
Renaming based on patch from Dmitry Adamushko.

Further clarification by renaming define and variable related to
microcode container file.

Signed-off-by: Peter Oruba <peter.oruba@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Oruba
2008-09-17 15:39:18 +02:00
committed by Ingo Molnar
parent b6cffde1a2
commit d4738792fb
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,21 +263,20 @@ static void * get_next_ucode(u8 *buf, unsigned int size,
unsigned int *mc_size) unsigned int *mc_size)
{ {
unsigned int total_size; unsigned int total_size;
#define UCODE_UNKNOWN_HDR 8 #define UCODE_CONTAINER_SECTION_HDR 8
u8 hdr[UCODE_UNKNOWN_HDR]; u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
void *mc; void *mc;
if (get_ucode_data(hdr, buf, UCODE_UNKNOWN_HDR)) if (get_ucode_data(section_hdr, buf, UCODE_CONTAINER_SECTION_HDR))
return NULL; return NULL;
if (hdr[0] != UCODE_UCODE_TYPE) { if (section_hdr[0] != UCODE_UCODE_TYPE) {
printk(KERN_ERR "microcode: error! " printk(KERN_ERR "microcode: error! "
"Wrong microcode payload type field\n"); "Wrong microcode payload type field\n");
return NULL; return NULL;
} }
/* FIXME! dimm: Why not by means of get_totalsize(hdr)? */ total_size = (unsigned long) (section_hdr[4] + (section_hdr[5] << 8));
total_size = (unsigned long) (hdr[4] + (hdr[5] << 8));
printk(KERN_INFO "microcode: size %u, total_size %u\n", printk(KERN_INFO "microcode: size %u, total_size %u\n",
size, total_size); size, total_size);
@@ -290,13 +289,13 @@ static void * get_next_ucode(u8 *buf, unsigned int size,
mc = vmalloc(UCODE_MAX_SIZE); mc = vmalloc(UCODE_MAX_SIZE);
if (mc) { if (mc) {
memset(mc, 0, UCODE_MAX_SIZE); memset(mc, 0, UCODE_MAX_SIZE);
if (get_ucode_data(mc, buf + UCODE_UNKNOWN_HDR, total_size)) { if (get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, total_size)) {
vfree(mc); vfree(mc);
mc = NULL; mc = NULL;
} else } else
*mc_size = total_size + UCODE_UNKNOWN_HDR; *mc_size = total_size + UCODE_CONTAINER_SECTION_HDR;
} }
#undef UCODE_UNKNOWN_HDR #undef UCODE_CONTAINER_SECTION_HDR
return mc; return mc;
} }