From: Jan Beulich Date: Wed, 9 Apr 2014 14:13:25 +0000 (+0200) Subject: x86/AMD: feature masking is unavailable on Fam11 X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5245 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=70e79fad6dc6f533ff83ee23b8d13de5a696d896;p=xen.git x86/AMD: feature masking is unavailable on Fam11 Reported-by: Aravind Gopalakrishnan Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 08ec56ac79..d55c0fd221 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -107,6 +107,10 @@ static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) ASSERT((status == not_parsed) && (smp_processor_id() == 0)); status = no_mask; + /* Fam11 doesn't support masking at all. */ + if (c->x86 == 0x11) + return; + if (~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx & opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) { feat_ecx = opt_cpuid_mask_ecx; @@ -176,7 +180,6 @@ static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) extfeat_ecx, extfeat_edx); setmask: - /* FIXME check if processor supports CPUID masking */ /* AMD processors prior to family 10h required a 32-bit password */ if (c->x86 >= 0x10) { wrmsr(MSR_K8_FEATURE_MASK, feat_edx, feat_ecx);