[perfmon2] [PATCH 3/3] x86/perfmon: Using cpuid to detect IBS on amd64

[Robert Richter]

Signed-off-by: Robert Richter <[EMAIL PROTECTED]>
---
 arch/x86/perfmon/perfmon_amd64.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/arch/x86/perfmon/perfmon_amd64.c b/arch/x86/perfmon/perfmon_amd64.c
index f60ce8e..7a9de2e 100644
--- a/arch/x86/perfmon/perfmon_amd64.c
+++ b/arch/x86/perfmon/perfmon_amd64.c
@@ -438,20 +438,22 @@ static int pfm_amd64_probe_pmu(void)
 
        switch (current_cpu_data.x86) {
        case 16:
-               if (current_cpu_data.x86_model >= 2) {
-                       /* Family 10h, RevB and later */
-                       ibs_status |= HAS_IBS;
-                       rdmsrl(MSR_AMD64_IBSCTL, val);
-               }
        case 15:
        case  6:
-               PFM_INFO("found family=%d VAL=0x%llx", current_cpu_data.x86, 
(unsigned long long)val);
                break;
        default:
                PFM_INFO("unsupported family=%d", current_cpu_data.x86);
                return -1;
        }
 
+       /* check for IBS */
+       if (cpu_has(&current_cpu_data, X86_FEATURE_IBS)) {
+               ibs_status |= HAS_IBS;
+               rdmsrl(MSR_AMD64_IBSCTL, val);
+       }
+
+       PFM_INFO("found family=%d IBSCTL=0x%llx", current_cpu_data.x86, 
(unsigned long long)val);
+
        /*
         * check for local APIC (required)
         */
-- 
1.5.5.3



-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
perfmon2-devel mailing list
perfmon2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/perfmon2-devel