提交 a1a32d29 编写于 作者: B Borislav Petkov 提交者: Ingo Molnar

x86/microcode/intel: Get rid of revision_is_newer()

It is a one-liner for checking microcode header revisions. On top of
that, it can be used wrong as it was the case in _save_mc(). Get rid of
it.
Signed-off-by: NBorislav Petkov <bp@suse.de>
Acked-by: NQuentin Casasnovas <quentin.casasnovas@oracle.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: NIngo Molnar <mingo@kernel.org>
上级 5198b443
......@@ -60,12 +60,6 @@ extern int get_matching_microcode(unsigned int csig, int cpf, int rev, void *mc)
extern int microcode_sanity_check(void *mc, int print_err);
extern int get_matching_sig(unsigned int csig, int cpf, int rev, void *mc);
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);
extern void load_ucode_intel_ap(void);
......
......@@ -262,7 +262,7 @@ static unsigned int _save_mc(struct microcode_intel **mc_saved,
found = 1;
if (!revision_is_newer(mc_hdr, new_rev))
if (mc_hdr->rev <= mc_saved_hdr->rev)
continue;
/*
......
......@@ -154,13 +154,13 @@ int get_matching_sig(unsigned int csig, int cpf, int rev, void *mc)
/*
* Returns 1 if update has been found, 0 otherwise.
*/
int get_matching_microcode(unsigned int csig, int cpf, int rev, void *mc)
int get_matching_microcode(unsigned int csig, int cpf, int new_rev, void *mc)
{
struct microcode_header_intel *mc_hdr = mc;
if (!revision_is_newer(mc_hdr, rev))
if (mc_hdr->rev <= new_rev)
return 0;
return get_matching_sig(csig, cpf, rev, mc);
return get_matching_sig(csig, cpf, new_rev, mc);
}
EXPORT_SYMBOL_GPL(get_matching_microcode);
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册