[Xen-changelog] [xen master] x86/AMD: feature masking is unavailable on Fam11

[patchbot@xxxxxxx]

commit 70e79fad6dc6f533ff83ee23b8d13de5a696d896
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Apr 9 16:13:25 2014 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Apr 9 16:13:25 2014 +0200

    x86/AMD: feature masking is unavailable on Fam11
    
    Reported-by: Aravind Gopalakrishnan<aravind.gopalakrishnan@xxxxxxx>
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/cpu/amd.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index 08ec56a..d55c0fd 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);
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog