[Xen-changelog] [xen-unstable] x86/Intel: add further support for Ivy Bridge CPU models

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1349172840 -7200
# Node ID 87bf99fad7a9f018530d13213f57610621838085
# Parent  5fbdbf585f5f2ee9a3e3c75a8a9f9f2cc6eda65c
x86/Intel: add further support for Ivy Bridge CPU models

And some initial Haswell ones at once.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: "Nakajima, Jun" <jun.nakajima@xxxxxxxxx>
---


diff -r 5fbdbf585f5f -r 87bf99fad7a9 xen/arch/x86/acpi/cpu_idle.c
--- a/xen/arch/x86/acpi/cpu_idle.c      Mon Oct 01 20:06:31 2012 +0100
+++ b/xen/arch/x86/acpi/cpu_idle.c      Tue Oct 02 12:14:00 2012 +0200
@@ -128,11 +128,15 @@ static void do_get_hw_residencies(void *
 
     switch ( c->x86_model )
     {
-    /* Ivy bridge */
-    case 0x3A:
     /* Sandy bridge */
     case 0x2A:
     case 0x2D:
+    /* Ivy bridge */
+    case 0x3A:
+    case 0x3E:
+    /* Haswell */
+    case 0x3c:
+    case 0x45:
         GET_PC2_RES(hw_res->pc2);
         GET_CC7_RES(hw_res->cc7);
         /* fall through */
diff -r 5fbdbf585f5f -r 87bf99fad7a9 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Mon Oct 01 20:06:31 2012 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Tue Oct 02 12:14:00 2012 +0200
@@ -1746,7 +1746,9 @@ static const struct lbr_info *last_branc
         /* Sandy Bridge */
         case 42: case 45:
         /* Ivy Bridge */
-        case 58:
+        case 58: case 62:
+        /* Haswell */
+        case 60: case 69:
             return nh_lbr;
             break;
         /* Atom */
diff -r 5fbdbf585f5f -r 87bf99fad7a9 xen/arch/x86/hvm/vmx/vpmu_core2.c
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c Mon Oct 01 20:06:31 2012 +0100
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c Tue Oct 02 12:14:00 2012 +0200
@@ -747,6 +747,7 @@ int vmx_vpmu_initialise(struct vcpu *v, 
         case 46:
         case 47:
         case 58:
+        case 62:
             ret = core2_vpmu_initialise(v, vpmu_flags);
             if ( !ret )
                 vpmu->arch_vpmu_ops = &core2_vpmu_ops;

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