x86/AMD: feature masking is unavailable on Fam11

Reported-by: Aravind Gopalakrishnan<aravind.gopalakrishnan@amd.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
master commit: 70e79fad6dc6f533ff83ee23b8d13de5a696d896
master date: 2014-04-09 16:13:25 +0200

diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index 0e2822f0f6a0169c6a3230308177b4e16a4cab89..4a0b9142b0eddaae54b880ab5111b156aeac73f4 100644 (file)
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -109,6 +109,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;
@@ -178,7 +182,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);