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

x86/microcode: Drop struct ucode_cpu_info.valid 

mainline inclusion
from mainline-v6.2-rc1
commit 254ed7cf
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=254ed7cf

Intel-SIG: commit 254ed7cf ("x86/microcode: Drop struct ucode_cpu_info.valid")

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

x86/microcode: Drop struct ucode_cpu_info.valid

It is not needed anymore.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarAshok Raj <ashok.raj@intel.com>
Link: https://lore.kernel.org/r/20221028142638.28498-6-bp@alien8.de


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

arch/x86/include/asm/microcode.h

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ struct microcode_ops { 


struct ucode_cpu_info {

	struct cpu_signature	cpu_sig;

	int			valid;

	void			*mc;

};

extern struct ucode_cpu_info ucode_cpu_info[];

arch/x86/kernel/cpu/intel.c

+0 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ int intel_cpu_collect_info(struct ucode_cpu_info *uci) 
	csig.rev = intel_get_microcode_revision();



	uci->cpu_sig = csig;

	uci->valid = 1;



	return 0;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -571,9 +571,9 @@ void microcode_bsp_resume(void) 
	int cpu = smp_processor_id();

	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;



	if (uci->valid && uci->mc)

	if (uci->mc)

		microcode_ops->apply_microcode(cpu);

	else if (!uci->mc)

	else

		reload_early_microcode();

}