56 lines
1.5 KiB
Diff
56 lines
1.5 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Jan Beulich <jbeulich@suse.com>
|
||
|
|
# 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@suse.com>
|
||
|
|
Acked-by: "Nakajima, Jun" <jun.nakajima@intel.com>
|
||
|
|
|
||
|
|
--- a/xen/arch/x86/acpi/cpu_idle.c
|
||
|
|
+++ b/xen/arch/x86/acpi/cpu_idle.c
|
||
|
|
@@ -105,11 +105,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 */
|
||
|
|
--- a/xen/arch/x86/hvm/vmx/vmx.c
|
||
|
|
+++ b/xen/arch/x86/hvm/vmx/vmx.c
|
||
|
|
@@ -1820,7 +1820,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 */
|
||
|
|
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
|
||
|
|
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
|
||
|
|
@@ -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;
|