Commit 6b072022 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Borislav Petkov (AMD)
Browse files

x86/microcode/intel: Simplify and rename generic_load_microcode() 



so it becomes less obfuscated and rename it because there is nothing
generic about it.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20231002115902.330295409@linutronix.de
parent b0f0bf5e

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

+17 −30
Original line number Diff line number Diff line
@@ -240,19 +240,6 @@ int intel_microcode_sanity_check(void *mc, bool print_err, int hdr_type) 
}

EXPORT_SYMBOL_GPL(intel_microcode_sanity_check);



/*

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

 */

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

{

	struct microcode_header_intel *mc_hdr = mc;



	if (mc_hdr->rev <= new_rev)

		return 0;



	return intel_find_matching_signature(mc, csig, cpf);

}



static void save_microcode_patch(void *data, unsigned int size)

{

	struct microcode_header_intel *p;
@@ -559,14 +546,12 @@ static enum ucode_state apply_microcode_intel(int cpu) 
	return ret;

}



static enum ucode_state generic_load_microcode(int cpu, struct iov_iter *iter)

static enum ucode_state parse_microcode_blobs(int cpu, struct iov_iter *iter)

{

	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;

	unsigned int curr_mc_size = 0, new_mc_size = 0;

	enum ucode_state ret = UCODE_OK;

	int new_rev = uci->cpu_sig.rev;

	int cur_rev = uci->cpu_sig.rev;

	u8 *new_mc = NULL, *mc = NULL;

	unsigned int csig, cpf;



	while (iov_iter_count(iter)) {

		struct microcode_header_intel mc_header;
@@ -583,6 +568,7 @@ static enum ucode_state generic_load_microcode(int cpu, struct iov_iter *iter) 
			pr_err("error! Bad data in microcode data file (totalsize too small)\n");

			break;

		}



		data_size = mc_size - sizeof(mc_header);

		if (data_size > iov_iter_count(iter)) {

			pr_err("error! Bad data in microcode data file (truncated file?)\n");
@@ -605,16 +591,17 @@ static enum ucode_state generic_load_microcode(int cpu, struct iov_iter *iter) 
			break;

		}



		csig = uci->cpu_sig.sig;

		cpf = uci->cpu_sig.pf;

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

		if (cur_rev >= mc_header.rev)

			continue;



		if (!intel_find_matching_signature(mc, uci->cpu_sig.sig, uci->cpu_sig.pf))

			continue;



		vfree(new_mc);

			new_rev = mc_header.rev;

		cur_rev = mc_header.rev;

		new_mc  = mc;

		new_mc_size = mc_size;

			mc = NULL;	/* trigger new vmalloc */

			ret = UCODE_NEW;

		}

		mc = NULL;

	}



	vfree(mc);
@@ -634,9 +621,9 @@ static enum ucode_state generic_load_microcode(int cpu, struct iov_iter *iter) 
	save_microcode_patch(new_mc, new_mc_size);



	pr_debug("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n",

		 cpu, new_rev, uci->cpu_sig.rev);

		 cpu, cur_rev, uci->cpu_sig.rev);



	return ret;

	return UCODE_NEW;

}



static bool is_blacklisted(unsigned int cpu)
@@ -685,7 +672,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device) 
	kvec.iov_base = (void *)firmware->data;

	kvec.iov_len = firmware->size;

	iov_iter_kvec(&iter, ITER_SOURCE, &kvec, 1, firmware->size);

	ret = generic_load_microcode(cpu, &iter);

	ret = parse_microcode_blobs(cpu, &iter);



	release_firmware(firmware);