From 22143eb77de49ab265f6a00e6413580d0d452594 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 6 Sep 2013 14:48:00 +0200 Subject: x86/Intel: add support for Haswell CPU models ... according to their most recent public documentation. Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 3e787021fb2420851c7bdc3911ea53c728ba5ac0 master date: 2013-08-27 11:15:15 +0200 --- xen/arch/x86/acpi/cpu_idle.c | 2 ++ xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/hvm/vmx/vpmu_core2.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 71f74abae0..c5c34dfbf0 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -113,7 +113,9 @@ static void do_get_hw_residencies(void *arg) case 0x3E: /* Haswell */ case 0x3C: + case 0x3F: case 0x45: + case 0x46: GET_PC2_RES(hw_res->pc2); GET_CC7_RES(hw_res->cc7); /* fall through */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index afcd760b9c..fa43971167 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1809,7 +1809,7 @@ static const struct lbr_info *last_branch_msr_get(void) /* Ivy Bridge */ case 58: case 62: /* Haswell */ - case 60: case 69: + case 60: case 63: case 69: case 70: 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 01dc518788..290fd9fe0d 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -747,7 +747,11 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) case 46: case 47: case 58: + case 60: case 62: + case 63: + case 69: + case 70: ret = core2_vpmu_initialise(v, vpmu_flags); if ( !ret ) vpmu->arch_vpmu_ops = &core2_vpmu_ops; -- cgit v1.2.3