Skip to content

Commit

Permalink
x86, microcode, AMD: Cleanup code a bit
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Borislav Petkov committed Nov 10, 2010
1 parent 1ea6be2 commit c7657ac
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 20 deletions.
6 changes: 6 additions & 0 deletions arch/x86/include/asm/microcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ static inline struct microcode_ops * __init init_intel_microcode(void)

#ifdef CONFIG_MICROCODE_AMD
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
static inline struct microcode_ops * __init init_amd_microcode(void)
{
Expand Down
25 changes: 5 additions & 20 deletions arch/x86/kernel/microcode_amd.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,21 +155,14 @@ static int apply_microcode_amd(int cpu)
return 0;
}

static int get_ucode_data(void *to, const u8 *from, size_t n)
{
memcpy(to, from, n);
return 0;
}

static void *
get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)
{
unsigned int total_size;
u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
void *mc;

if (get_ucode_data(section_hdr, buf, UCODE_CONTAINER_SECTION_HDR))
return NULL;
get_ucode_data(section_hdr, buf, UCODE_CONTAINER_SECTION_HDR);

if (section_hdr[0] != UCODE_UCODE_TYPE) {
pr_err("error: invalid type field in container file section header\n");
Expand All @@ -187,12 +180,8 @@ get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)
if (!mc)
return NULL;

if (get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, total_size)) {
vfree(mc);
mc = NULL;
} else {
*mc_size = total_size + UCODE_CONTAINER_SECTION_HDR;
}
get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, total_size);
*mc_size = total_size + UCODE_CONTAINER_SECTION_HDR;

return mc;
}
Expand All @@ -203,8 +192,7 @@ static int install_equiv_cpu_table(const u8 *buf)
unsigned int *buf_pos = (unsigned int *)container_hdr;
unsigned long size;

if (get_ucode_data(&container_hdr, buf, UCODE_CONTAINER_HEADER_SIZE))
return 0;
get_ucode_data(&container_hdr, buf, UCODE_CONTAINER_HEADER_SIZE);

size = buf_pos[2];

Expand All @@ -220,10 +208,7 @@ static int install_equiv_cpu_table(const u8 *buf)
}

buf += UCODE_CONTAINER_HEADER_SIZE;
if (get_ucode_data(equiv_cpu_table, buf, size)) {
vfree(equiv_cpu_table);
return 0;
}
get_ucode_data(equiv_cpu_table, buf, size);

return size + UCODE_CONTAINER_HEADER_SIZE; /* add header length */
}
Expand Down

0 comments on commit c7657ac

Please sign in to comment.