cpupower: IvyBridge (0x3a and 0x3e models) support

Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/tools/power/cpupower/utils/helpers/cpuid.c b/tools/power/cpupower/utils/helpers/cpuid.c
index 906895d21cce3ca79cd383677defe93f00923258..93b0aa74ca03bada7db24ae827b902ce09591bef 100644 (file)
--- a/tools/power/cpupower/utils/helpers/cpuid.c
+++ b/tools/power/cpupower/utils/helpers/cpuid.c
@@ -158,6 +158,8 @@ out:
                                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/tools/power/cpupower/utils/idle_monitor/snb_idle.c b/tools/power/cpupower/utils/idle_monitor/snb_idle.c
index a1bc07cd53e1c5db595031a8892e2afaa5d3f487..a99b43b97d6d331d85d2e3610ff9bcdbe04524ff 100644 (file)
--- a/tools/power/cpupower/utils/idle_monitor/snb_idle.c
+++ b/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++) {