---

yaml --- r: 336758 b: refs/heads/master c: 8d219e3 h: refs/heads/master v: v3
git-mirror · Nov 27, 2012 · 8edaeb9 · 8edaeb9
1 parent 3d1987f
commit 8edaeb9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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++) {