Commit d75018fd authored by Borislav Petkov's avatar Borislav Petkov Committed by Aichun Shi
Browse files

x86/microcode: Remove ->request_microcode_user() 

mainline inclusion
from mainline-v6.1-rc1
commit 8c61eafd
category: feature
feature: Backport Intel In Field Scan(IFS) multi-blob images support
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I6L337
CVE: N/A
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/


commit/?id=8c61eafd

Intel-SIG: commit 8c61eafd ("x86/microcode: Remove ->request_microcode_user()")

-------------------------------------

x86/microcode: Remove ->request_microcode_user()

  181b6f40 ("x86/microcode: Rip out the OLD_INTERFACE")

removed the old microcode loading interface but forgot to remove the
related ->request_microcode_user() functionality which it uses.

Rip it out now too.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20220825075445.28171-1-bp@alien8.de


Signed-off-by: default avatarAichun Shi <aichun.shi@intel.com>
parent a900863b

arch/x86/include/asm/microcode.h

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ enum ucode_state { 
};



struct microcode_ops {

	enum ucode_state (*request_microcode_user) (int cpu,

				const void __user *buf, size_t size);



	enum ucode_state (*request_microcode_fw) (int cpu, struct device *,

						  bool refresh_fw);

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

+0 −7
Original line number Diff line number Diff line
@@ -919,12 +919,6 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device, 
	return ret;

}



static enum ucode_state

request_microcode_user(int cpu, const void __user *buf, size_t size)

{

	return UCODE_ERROR;

}



static void microcode_fini_cpu_amd(int cpu)

{

	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
@@ -933,7 +927,6 @@ static void microcode_fini_cpu_amd(int cpu) 
}



static struct microcode_ops microcode_amd_ops = {

	.request_microcode_user           = request_microcode_user,

	.request_microcode_fw             = request_microcode_amd,

	.collect_cpu_info                 = collect_cpu_info_amd,

	.apply_microcode                  = apply_microcode_amd,

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

+0 −17
Original line number Diff line number Diff line
@@ -909,24 +909,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device, 
	return ret;

}



static enum ucode_state

request_microcode_user(int cpu, const void __user *buf, size_t size)

{

	struct iov_iter iter;

	struct iovec iov;



	if (is_blacklisted(cpu))

		return UCODE_NFOUND;



	iov.iov_base = (void __user *)buf;

	iov.iov_len = size;

	iov_iter_init(&iter, WRITE, &iov, 1, size);



	return generic_load_microcode(cpu, &iter);

}



static struct microcode_ops microcode_intel_ops = {

	.request_microcode_user		  = request_microcode_user,

	.request_microcode_fw             = request_microcode_fw,

	.collect_cpu_info                 = collect_cpu_info,

	.apply_microcode                  = apply_microcode_intel,