7505a6b224
23993-x86-microcode-amd-fix-23871.patch - Update to Xen 4.1.2 FCS c/s 23174 - bnc#720054 - Fix syntax error introduced during recent adjustment of Xen's tap udev rule. Updated udev-rules.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=154
72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
# HG changeset patch
|
|
# User Jan Beulich <jbeulich@novell.com>
|
|
# Date 1319475620 -3600
|
|
# Node ID e458dfc35b8d3be04a9b72c30ff97163e27a7314
|
|
# Parent ffe861c1d5dfa8f4485052e5600e06124105033f
|
|
x86/ucode-amd: fix regression from c/s 23871:503ee256fecf
|
|
|
|
microcode_fits() must return distinct values for the success and
|
|
no-fit-but-no-error cases, so the caller can react accordingly. Make
|
|
it return 1 in the success case, and adjust its single caller.
|
|
|
|
Also remove an impossible code path - install_equiv_cpu_table(), which
|
|
gets called prior to microcode_fits(), never leaves equiv_cpu_table
|
|
being NULL without also returning an error.
|
|
|
|
Note that this is still awaiting testing on a system where the
|
|
regression was actually observed (which also requires a new enough
|
|
microcode_ctl package). Note also that this will need to be
|
|
backported to 4.0 and 4.1 (or the broken c/s that got backported
|
|
there reverted).
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@novell.com>
|
|
Committed-by: Keir Fraser <keir@xen.org>
|
|
|
|
Index: xen-4.1.2-testing/xen/arch/x86/microcode_amd.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/xen/arch/x86/microcode_amd.c
|
|
+++ xen-4.1.2-testing/xen/arch/x86/microcode_amd.c
|
|
@@ -76,14 +76,6 @@ static int microcode_fits(void *mc, int
|
|
/* We should bind the task to the CPU */
|
|
BUG_ON(cpu != raw_smp_processor_id());
|
|
|
|
- if ( equiv_cpu_table == NULL )
|
|
- {
|
|
- printk(KERN_INFO "microcode: CPU%d microcode update with "
|
|
- "version 0x%x (current=0x%x)\n",
|
|
- cpu, mc_header->patch_id, uci->cpu_sig.rev);
|
|
- goto out;
|
|
- }
|
|
-
|
|
current_cpu_id = cpuid_eax(0x00000001);
|
|
|
|
for ( i = 0; equiv_cpu_table[i].installed_cpu != 0; i++ )
|
|
@@ -96,7 +88,7 @@ static int microcode_fits(void *mc, int
|
|
}
|
|
|
|
if ( !equiv_cpu_id )
|
|
- return 0;
|
|
+ return 0;
|
|
|
|
if ( (mc_header->processor_rev_id) != equiv_cpu_id )
|
|
{
|
|
@@ -113,8 +105,7 @@ static int microcode_fits(void *mc, int
|
|
"update with version 0x%x (current=0x%x)\n",
|
|
cpu, mc_header->patch_id, uci->cpu_sig.rev);
|
|
|
|
-out:
|
|
- return 0;
|
|
+ return 1;
|
|
}
|
|
|
|
static int apply_microcode(int cpu)
|
|
@@ -289,7 +280,7 @@ static int cpu_request_microcode(int cpu
|
|
while ( (ret = get_next_ucode_from_buffer_amd(mc, buf, size, &offset)) == 0)
|
|
{
|
|
error = microcode_fits(mc, cpu);
|
|
- if (error != 0)
|
|
+ if (error <= 0)
|
|
continue;
|
|
|
|
error = apply_microcode(cpu);
|