x86: add Ivy Bridge model numbers to model specific MSR handling

This is model 0x3a (decimal 58) as per the most recent SDM.

In vPMU code, also add a forgotten earlier model.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Xiantao Zhang<xiantao.zhang@intel.com>

diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
index 6af528510511125554b2880a1f976a1e06bea50f..0102b6329e32f3dc4598912625a91fa4fa64f7d7 100644 (file)
--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -106,6 +106,8 @@ static void do_get_hw_residencies(void *arg)
 
     switch ( c->x86_model )
     {
+    /* Ivy bridge */
+    case 0x3A:
     /* Sandy bridge */
     case 0x2A:
     case 0x2D:

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 935b25b68161e450133048d72d708d08bf277a00..0f65334bbdc46b9ec550fb6f9d1d98dbae3b2840 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -1751,6 +1751,8 @@ static const struct lbr_info *last_branch_msr_get(void)
         case 37: case 44: case 47:
         /* Sandy Bridge */
         case 42: case 45:
+        /* Ivy Bridge */
+        case 58:
             return nh_lbr;
             break;
         /* Atom */

diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c
index 35ef78a5fdd8a5dc3b56d906d98b7f5e44c55e5e..7412dc8bcdd6ce82b85be6a8d0d3811db5ad8a8f 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
@@ -623,8 +623,10 @@ int vmx_vpmu_initialise(struct vcpu *v)
         case 26:
         case 29:
         case 42:
+        case 45:
         case 46:
         case 47:
+        case 58:
             vpmu->arch_vpmu_ops = &core2_vpmu_ops;
             return 0;
         }