diff --git a/cpupower-ivy_bridge_support.patch b/cpupower-ivy_bridge_support.patch new file mode 100644 index 0000000..af16156 --- /dev/null +++ b/cpupower-ivy_bridge_support.patch @@ -0,0 +1,44 @@ +From: Thomas Renninger +Subject: cpupower: IvyBridge (0x3a and 0x3e models) support +References: fate#313856 +Patch-Mainline: Queued in subsystem tree (see Git-Repo:) +Git-commit: 7f163b1bd6e3f7bfa648069770acf2c8fe3d9097 +Git-repo: gitolite@ra.kernel.org:/pub/scm/linux/kernel/git/trenn/cpupower + +Signed-off-by: Thomas Renninger + +diff --git a/utils/helpers/cpuid.c b/utils/helpers/cpuid.c +index 906895d..93b0aa7 100644 +--- a/utils/helpers/cpuid.c ++++ b/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/utils/idle_monitor/snb_idle.c b/utils/idle_monitor/snb_idle.c +index a1bc07c..a99b43b 100644 +--- a/utils/idle_monitor/snb_idle.c ++++ b/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++) { diff --git a/cpupower.changes b/cpupower.changes index 497b440..da66190 100644 --- a/cpupower.changes +++ b/cpupower.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 13 11:08:12 UTC 2012 - trenn@suse.de + +- Add ivy bridge processor (EP and EX) support + ------------------------------------------------------------------- Tue May 8 15:25:00 UTC 2012 - trenn@suse.de diff --git a/cpupower.spec b/cpupower.spec index aabcdc7..9ad4d0d 100644 --- a/cpupower.spec +++ b/cpupower.spec @@ -29,6 +29,7 @@ License: GPL-2.0 Group: System/Base Source: %{name}-%{version}.tar.bz2 Source1: cpupower_export_tarball_from_git.sh +Patch0: cpupower-ivy_bridge_support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gettext-tools BuildRequires: pciutils @@ -72,6 +73,7 @@ powersave module. %prep %setup -q +%patch0 -p1 %build # This package failed when testing with -Wl,-as-needed being default.