From: Jan Beulich Date: Fri, 28 Sep 2012 07:28:11 +0000 (+0200) Subject: x86/ucode: fix Intel case of resume handling on boot CPU X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7839 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0e82871ca3222f91ffe8b96768ece1b89ce96d12;p=xen.git x86/ucode: fix Intel case of resume handling on boot CPU Checking the stored version doesn't tell us anything about the need to apply the update (during resume, what is stored doesn't necessarily match what is loaded). Note that the check can be removed altogether because once switched to use what was read from the CPU (uci->cpu_sig.rev, as used in the subsequent pr_debug()), it would become redundant with the checks that lead to microcode_update_match() returning the indication that an update should be applied. Note further that this was not an issue on APs since they start with uci->mc.mc_intel being NULL. Signed-off-by: Jan Beulich Tested-by: Ben Guthro Acked-by: Keir Fraser --- diff --git a/xen/arch/x86/microcode_intel.c b/xen/arch/x86/microcode_intel.c index afaf61f4c5..b54cd714ab 100644 --- a/xen/arch/x86/microcode_intel.c +++ b/xen/arch/x86/microcode_intel.c @@ -261,8 +261,6 @@ static int get_matching_microcode(const void *mc, int cpu) } return 0; find: - if ( uci->mc.mc_intel && uci->mc.mc_intel->hdr.rev >= mc_header->rev ) - return 0; pr_debug("microcode: CPU%d found a matching microcode update with" " version %#x (current=%#x)\n", cpu, mc_header->rev, uci->cpu_sig.rev);