Commit 8de3eafc authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/microcode/intel: Rename get_matching_microcode 



... to has_newer_microcode() as it does exactly that: checks
whether binary data @MC has newer microcode patch than the
applied one. Move @MC to be the first function arg too.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1431860101-14847-2-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 6b44e72a

arch/x86/include/asm/microcode_intel.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct extended_sigtable { 


#define exttable_size(et) ((et)->count * EXT_SIGNATURE_SIZE + EXT_HEADER_SIZE)



extern int get_matching_microcode(unsigned int csig, int cpf, int rev, void *mc);

extern int has_newer_microcode(void *mc, unsigned int csig, int cpf, int rev);

extern int microcode_sanity_check(void *mc, int print_err);

extern int get_matching_sig(unsigned int csig, int cpf, void *mc);

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

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int get_matching_mc(struct microcode_intel *mc_intel, int cpu) 
	cpf = cpu_sig.pf;

	crev = cpu_sig.rev;



	return get_matching_microcode(csig, cpf, crev, mc_intel);

	return has_newer_microcode(mc_intel, csig, cpf, crev);

}



static int apply_microcode_intel(int cpu)
@@ -165,7 +165,7 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size, 


		csig = uci->cpu_sig.sig;

		cpf = uci->cpu_sig.pf;

		if (get_matching_microcode(csig, cpf, new_rev, mc)) {

		if (has_newer_microcode(mc, csig, cpf, new_rev)) {

			vfree(new_mc);

			new_rev = mc_header.rev;

			new_mc  = mc;

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

+4 −4
Original line number Diff line number Diff line
@@ -59,10 +59,10 @@ load_microcode_early(struct microcode_intel **saved, 
		ucode_ptr = saved[i];

		mc_hdr	  = (struct microcode_header_intel *)ucode_ptr;



		ret = get_matching_microcode(uci->cpu_sig.sig,

		ret = has_newer_microcode(ucode_ptr,

					  uci->cpu_sig.sig,

					  uci->cpu_sig.pf,

					     new_rev,

					     ucode_ptr);

					  new_rev);

		if (!ret)

			continue;

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

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ int get_matching_sig(unsigned int csig, int cpf, void *mc) 
/*

 * Returns 1 if update has been found, 0 otherwise.

 */

int get_matching_microcode(unsigned int csig, int cpf, int new_rev, void *mc)

int has_newer_microcode(void *mc, unsigned int csig, int cpf, int new_rev)

{

	struct microcode_header_intel *mc_hdr = mc;
@@ -163,4 +163,4 @@ int get_matching_microcode(unsigned int csig, int cpf, int new_rev, void *mc) 


	return get_matching_sig(csig, cpf, mc);

}

EXPORT_SYMBOL_GPL(get_matching_microcode);
 
EXPORT_SYMBOL_GPL(has_newer_microcode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE