From: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com>
Date: Wed, 31 Aug 2011 14:17:45 +0000 (+0100)
Subject: vpmu: Add processors Westmere E7-8837 and SandyBridge i5-2500 to the vpmu list
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~9933
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f4c78e40fd1a9a6d4039dff42ecb37ba8087f99;p=xen.git

vpmu: Add processors Westmere E7-8837 and SandyBridge i5-2500 to the vpmu list

Signed-off-by: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com>
---

diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c
index 369330ea45..bfff882b1a 100644
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
@@ -58,7 +58,8 @@ static void check_pmc_quirk(void)
     is_pmc_quirk = 0;
     if ( family == 6 )
     {
-        if ( cpu_model == 46 || cpu_model == 26 )
+        if ( cpu_model == 47 || cpu_model == 46 || cpu_model == 42 ||
+             cpu_model == 26 )
             is_pmc_quirk = 1;
     }
 }
diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c
index 59076fd1ad..d761fb2c91 100644
--- a/xen/arch/x86/hvm/vpmu.c
+++ b/xen/arch/x86/hvm/vpmu.c
@@ -119,7 +119,9 @@ void vpmu_initialise(struct vcpu *v)
             case 23:
             case 26:
             case 29:
+            case 42:
             case 46:
+            case 47:
                 vpmu->arch_vpmu_ops = &core2_vpmu_ops;
                 break;
             }