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

x86, microcode, AMD: Cleanup code a bit

Browse Source 
get_ucode_data is a memcpy() wrapper which always returns 0. Move it
into the header and make it an inline. Remove all code checking its
return value and turn it into a void.

There should be no functionality change resulting from this patch.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
This commit is contained in:
Borislav Petkov
2010-11-01 23:36:53 +01:00
parent 1ea6be212e
commit c7657ac0c3
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/include/asm/microcode.h
View File

@@ -48,6 +48,12 @@ static inline struct microcode_ops * __init init_intel_microcode(void)
#ifdef CONFIG_MICROCODE_AMD #ifdef CONFIG_MICROCODE_AMD
extern struct microcode_ops * __init init_amd_microcode(void); extern struct microcode_ops * __init init_amd_microcode(void);
static inline void get_ucode_data(void *to, const u8 *from, size_t n)
{
memcpy(to, from, n);
}
#else #else
static inline struct microcode_ops * __init init_amd_microcode(void) static inline struct microcode_ops * __init init_amd_microcode(void)
{ {

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

@@ -155,12 +155,6 @@ static int apply_microcode_amd(int cpu)
return 0; return 0;
} }
static int get_ucode_data(void *to, const u8 *from, size_t n)
{
memcpy(to, from, n);
return 0;
}
static void * static void *
get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size) get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)
{ {
@@ -168,8 +162,7 @@ get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)
u8 section_hdr[UCODE_CONTAINER_SECTION_HDR]; u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
void *mc; void *mc;
if (get_ucode_data(section_hdr, buf, UCODE_CONTAINER_SECTION_HDR)) get_ucode_data(section_hdr, buf, UCODE_CONTAINER_SECTION_HDR);
return NULL;
if (section_hdr[0] != UCODE_UCODE_TYPE) { if (section_hdr[0] != UCODE_UCODE_TYPE) {
pr_err("error: invalid type field in container file section header\n"); pr_err("error: invalid type field in container file section header\n");
@@ -187,12 +180,8 @@ get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)
if (!mc) if (!mc)
return NULL; return NULL;
if (get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, total_size)) { get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, total_size);
vfree(mc);
mc = NULL;
} else {
*mc_size = total_size + UCODE_CONTAINER_SECTION_HDR; *mc_size = total_size + UCODE_CONTAINER_SECTION_HDR;
}
return mc; return mc;
} }
@@ -203,8 +192,7 @@ static int install_equiv_cpu_table(const u8 *buf)
unsigned int *buf_pos = (unsigned int *)container_hdr; unsigned int *buf_pos = (unsigned int *)container_hdr;
unsigned long size; unsigned long size;
if (get_ucode_data(&container_hdr, buf, UCODE_CONTAINER_HEADER_SIZE)) get_ucode_data(&container_hdr, buf, UCODE_CONTAINER_HEADER_SIZE);
return 0;
size = buf_pos[2]; size = buf_pos[2];
@@ -220,10 +208,7 @@ static int install_equiv_cpu_table(const u8 *buf)
} }
buf += UCODE_CONTAINER_HEADER_SIZE; buf += UCODE_CONTAINER_HEADER_SIZE;
if (get_ucode_data(equiv_cpu_table, buf, size)) { get_ucode_data(equiv_cpu_table, buf, size);
vfree(equiv_cpu_table);
return 0;
}
return size + UCODE_CONTAINER_HEADER_SIZE; /* add header length */ return size + UCODE_CONTAINER_HEADER_SIZE; /* add header length */
} }