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

Commit 9198251a authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/microcode/intel: Rename load_microcode_early() to find_microcode_patch() 



This function does exactly that: it goes through the previously saved
array of microcode blobs and finds the proper one for the current CPU.
Rename it accordingly.

No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1465225850-7352-7-git-send-email-bp@alien8.de


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

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

+5 −5
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static struct ucode_blobs { 
} blobs;



static enum ucode_state

load_microcode_early(struct microcode_intel **saved,

find_microcode_patch(struct microcode_intel **saved,

		     unsigned int num_saved, struct ucode_cpu_info *uci)

{

	struct microcode_intel *ucode_ptr, *new_mc = NULL;
@@ -127,13 +127,13 @@ load_microcode(struct mc_saved_data *mcs, unsigned long *mc_ptrs, 
	if (!mcs->mc_saved) {

		copy_ptrs(mc_saved_tmp, mc_ptrs, offset, count);



		return load_microcode_early(mc_saved_tmp, count, uci);

		return find_microcode_patch(mc_saved_tmp, count, uci);

	} else {

#ifdef CONFIG_X86_32

		microcode_phys(mc_saved_tmp, mcs);

		return load_microcode_early(mc_saved_tmp, count, uci);

		return find_microcode_patch(mc_saved_tmp, count, uci);

#else

		return load_microcode_early(mcs->mc_saved, count, uci);

		return find_microcode_patch(mcs->mc_saved, count, uci);

#endif

	}

}
@@ -834,7 +834,7 @@ void reload_ucode_intel(void) 


	collect_cpu_info_early(&uci);



	ret = load_microcode_early(mc_saved_data.mc_saved,

	ret = find_microcode_patch(mc_saved_data.mc_saved,

				   mc_saved_data.num_saved, &uci);

	if (ret != UCODE_OK)

		return;