Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f5e5f2b authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86/microcode/intel: Rename update_match_revision() 



... to revision_is_newer() and push it up into the header and make it an
inline function.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent c868570e

arch/x86/include/asm/microcode_intel.h

+6 −2
Original line number Diff line number Diff line
@@ -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);

arch/x86/kernel/cpu/microcode/intel_early.c

+1 −1
Original line number Diff line number Diff line
@@ -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;



		/*

arch/x86/kernel/cpu/microcode/intel_lib.c

+1 −7
Original line number Diff line number Diff line
@@ -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;
@@ -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);