summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpufreq-intel-pstate-max-is-in-the-max-variable-who-knew.patch42
-rw-r--r--kernel.spec5
2 files changed, 47 insertions, 0 deletions
diff --git a/cpufreq-intel-pstate-max-is-in-the-max-variable-who-knew.patch b/cpufreq-intel-pstate-max-is-in-the-max-variable-who-knew.patch
new file mode 100644
index 000000000..e0d590b21
--- /dev/null
+++ b/cpufreq-intel-pstate-max-is-in-the-max-variable-who-knew.patch
@@ -0,0 +1,42 @@
+From: dirk.brandewie@gmail.com
+To: linux-kernel@vger.kernel.org, cpufreq@vger.kernel.org
+Cc: Dirk Brandewie <dirk.brandewie@gmail.com>,
+ Dirk Brandewie <dirk.j.brandewie@intel.com>
+Subject: [PATCH] cpufreq/intel_pstate: Fix calculation of current frequency
+Date: Fri, 22 Mar 2013 10:51:05 -0700
+Message-Id: <1363974665-22049-1-git-send-email-dirk.brandewie@gmail.com>
+
+From: Dirk Brandewie <dirk.brandewie@gmail.com>
+
+Use the correct pstate value to calculate the effective frequency.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=923942
+Reported-by: Satish Balay <balay@fastmail.fm>
+
+Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
+---
+ drivers/cpufreq/intel_pstate.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
+index e84af66..ad72922 100644
+--- a/drivers/cpufreq/intel_pstate.c
++++ b/drivers/cpufreq/intel_pstate.c
+@@ -454,7 +454,7 @@ static inline void intel_pstate_calc_busy(struct cpudata *cpu,
+ sample->idletime_us * 100,
+ sample->duration_us);
+ core_pct = div64_u64(sample->aperf * 100, sample->mperf);
+- sample->freq = cpu->pstate.turbo_pstate * core_pct * 1000;
++ sample->freq = cpu->pstate.max_pstate * core_pct * 1000;
+
+ sample->core_pct_busy = div_s64((sample->pstate_pct_busy * core_pct),
+ 100);
+--
+1.7.7.6
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at http://www.tux.org/lkml/
+
diff --git a/kernel.spec b/kernel.spec
index 1f56d3aaf..ea4a0411b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -752,6 +752,7 @@ Patch22000: weird-root-dentry-name-debug.patch
Patch22001: selinux-apply-different-permission-to-ptrace-child.patch
Patch23000: cpufreq-intel-pstate-validate-msrs.patch
+Patch23001: cpufreq-intel-pstate-max-is-in-the-max-variable-who-knew.patch
# END OF PATCH DEFINITIONS
@@ -1420,6 +1421,7 @@ ApplyPatch selinux-apply-different-permission-to-ptrace-child.patch
# rhbz 922923
ApplyPatch cpufreq-intel-pstate-validate-msrs.patch
+ApplyPatch cpufreq-intel-pstate-max-is-in-the-max-variable-who-knew.patch
#rhbz 859485
ApplyPatch vt-Drop-K_OFF-for-VC_MUTE.patch
@@ -2290,6 +2292,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Mar 22 2013 Dave Jones <davej@redhat.com>
+- Fix calculation of current frequency in intel_pstate driver. (rhbz 923942)
+
* Thu Mar 21 2013 Josh Boyer <jwboyer@redhat.com>
- Fix workqueue crash in mac80211 (rhbz 920218)