x86: Add Xenoprofile support for AMD Family16h

Add Xenoprofile support for AMD Family16h. The corresponded OProfile
patch has already been submitted to OProfile mailing list.
(http://marc.info/?l=oprofile-list&m=136036136017302&w=2 ).

Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Committed-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c
index 96eee8c27a2e1e76a8d84e40817fe724d377b440..bf186fea3dd11ac55b79ddd9197c222912ada2f2 100644 (file)
--- a/xen/arch/x86/hvm/svm/vpmu.c
+++ b/xen/arch/x86/hvm/svm/vpmu.c
@@ -314,6 +314,7 @@ static int amd_vpmu_initialise(struct vcpu *v)
         case 0x10:
         case 0x12:
         case 0x14:
+        case 0x16:
         default:
             num_counters = F10H_NUM_COUNTERS;
             counters = AMD_F10H_COUNTERS;
@@ -375,6 +376,7 @@ int svm_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags)
     case 0x12:
     case 0x14:
     case 0x15:
+    case 0x16:
         ret = amd_vpmu_initialise(v);
         if ( !ret )
             vpmu->arch_vpmu_ops = &amd_vpmu_ops;

diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c
index 0710db270820aaedcef98e7337e60523da8cbac4..c824b84eafd103c8237441a7ba0856807937a396 100644 (file)
--- a/xen/arch/x86/oprofile/nmi_int.c
+++ b/xen/arch/x86/oprofile/nmi_int.c
@@ -415,6 +415,10 @@ static int __init nmi_init(void)
                                 model = &op_amd_fam15h_spec;
                                 cpu_type = "x86-64/family15h";
                                 break;
+                       case 0x16:
+                               model = &op_athlon_spec;
+                               cpu_type = "x86-64/family16h";
+                               break;
                        }
                        break;