From 8edaeb9efe441f8eede57350745a6f47ff178f03 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Tue, 27 Nov 2012 13:17:49 +0100 Subject: [PATCH] --- yaml --- r: 336758 b: refs/heads/master c: 8d219e3658c092731cbebe5ab62f15480a815683 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/power/cpupower/utils/helpers/cpuid.c | 2 ++ .../tools/power/cpupower/utils/idle_monitor/snb_idle.c | 10 ++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b7e086944bbe..ac727b257cd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8cfc3c6bf404b0f110631d5bba234982e6ad24f +refs/heads/master: 8d219e3658c092731cbebe5ab62f15480a815683 diff --git a/trunk/tools/power/cpupower/utils/helpers/cpuid.c b/trunk/tools/power/cpupower/utils/helpers/cpuid.c index 906895d21cce..93b0aa74ca03 100644 --- a/trunk/tools/power/cpupower/utils/helpers/cpuid.c +++ b/trunk/tools/power/cpupower/utils/helpers/cpuid.c @@ -158,6 +158,8 @@ int get_cpu_info(unsigned int cpu, struct cpupower_cpu_info *cpu_info) cpu_info->caps |= CPUPOWER_CAP_HAS_TURBO_RATIO; case 0x2A: /* SNB */ case 0x2D: /* SNB Xeon */ + case 0x3A: /* IVB */ + case 0x3E: /* IVB Xeon */ cpu_info->caps |= CPUPOWER_CAP_HAS_TURBO_RATIO; cpu_info->caps |= CPUPOWER_CAP_IS_SNB; break; diff --git a/trunk/tools/power/cpupower/utils/idle_monitor/snb_idle.c b/trunk/tools/power/cpupower/utils/idle_monitor/snb_idle.c index a1bc07cd53e1..a99b43b97d6d 100644 --- a/trunk/tools/power/cpupower/utils/idle_monitor/snb_idle.c +++ b/trunk/tools/power/cpupower/utils/idle_monitor/snb_idle.c @@ -150,9 +150,15 @@ static struct cpuidle_monitor *snb_register(void) || cpupower_cpu_info.family != 6) return NULL; - if (cpupower_cpu_info.model != 0x2A - && cpupower_cpu_info.model != 0x2D) + switch (cpupower_cpu_info.model) { + case 0x2A: /* SNB */ + case 0x2D: /* SNB Xeon */ + case 0x3A: /* IVB */ + case 0x3E: /* IVB Xeon */ + break; + default: return NULL; + } is_valid = calloc(cpu_count, sizeof(int)); for (num = 0; num < SNB_CSTATE_COUNT; num++) {