Skip to content

Commit

Permalink
x86/microcode/intel: Rename update_match_revision()
Browse files Browse the repository at this point in the history
... to revision_is_newer() and push it up into the header and make it an
inline function.

Signed-off-by: Borislav Petkov <bp@suse.de>
  • Loading branch information
Borislav Petkov committed Mar 2, 2015
1 parent c868570 commit 4f5e5f2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
8 changes: 6 additions & 2 deletions arch/x86/include/asm/microcode_intel.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,12 @@ extern int
get_matching_microcode(unsigned int csig, int cpf, void *mc, int rev);
extern int microcode_sanity_check(void *mc, int print_err);
extern int get_matching_sig(unsigned int csig, int cpf, void *mc, int rev);
extern int
update_match_revision(struct microcode_header_intel *mc_header, int rev);

static inline int
revision_is_newer(struct microcode_header_intel *mc_header, int rev)
{
return (mc_header->rev <= rev) ? 0 : 1;
}

#ifdef CONFIG_MICROCODE_INTEL_EARLY
extern void __init load_ucode_intel_bsp(void);
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/cpu/microcode/intel_early.c
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ static unsigned int _save_mc(struct microcode_intel **mc_saved,

found = 1;

if (!update_match_revision(mc_hdr, new_rev))
if (!revision_is_newer(mc_hdr, new_rev))
continue;

/*
Expand Down
8 changes: 1 addition & 7 deletions arch/x86/kernel/cpu/microcode/intel_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ update_match_cpu(unsigned int csig, unsigned int cpf,
return (!sigmatch(sig, csig, pf, cpf)) ? 0 : 1;
}

int
update_match_revision(struct microcode_header_intel *mc_header, int rev)
{
return (mc_header->rev <= rev) ? 0 : 1;
}

int microcode_sanity_check(void *mc, int print_err)
{
unsigned long total_size, data_size, ext_table_size;
Expand Down Expand Up @@ -166,7 +160,7 @@ int get_matching_microcode(unsigned int csig, int cpf, void *mc, int rev)
{
struct microcode_header_intel *mc_header = mc;

if (!update_match_revision(mc_header, rev))
if (!revision_is_newer(mc_header, rev))
return 0;

return get_matching_sig(csig, cpf, mc, rev);
Expand Down

0 comments on commit 4f5e5f2

Please sign in to comment.