Commit 4ea418b3 authored by Aichun Shi's avatar Aichun Shi
Browse files

Revert "x86/microcode: Drop struct ucode_cpu_info.valid" 

Intel inclusion
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: N/A

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

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

This reverts commit e6a1a829.

This revert is to recover old microcode interface /dev/cpu/microcode.

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

arch/x86/include/asm/microcode.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ 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->mc)

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

		microcode_ops->apply_microcode(cpu);

	else

	else if (!uci->mc)

		reload_early_microcode();

}