delete intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.path

from 3.10, 3.12, and 3.13 trees as it causes problems...

diff --git a/queue-3.10/intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.patch b/queue-3.10/intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.patch
deleted file mode 100644 (file)
index d3c6d9d..0000000
--- a/queue-3.10/intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From fcb6a15c2e7e76d493e6f91ea889ab40e1c643a4 Mon Sep 17 00:00:00 2001
-From: Dirk Brandewie <dirk.j.brandewie@intel.com>
-Date: Mon, 3 Feb 2014 08:55:31 -0800
-Subject: intel_pstate: Take core C0 time into account for core busy calculation
-
-From: Dirk Brandewie <dirk.j.brandewie@intel.com>
-
-commit fcb6a15c2e7e76d493e6f91ea889ab40e1c643a4 upstream.
-
-Take non-idle time into account when calculating core busy time.
-This ensures that intel_pstate will notice a decrease in load.
-
-References: https://bugzilla.kernel.org/show_bug.cgi?id=66581
-Cc: 3.10+ <stable@vger.kernel.org> # 3.10+
-Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/cpufreq/intel_pstate.c |   16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
---- a/drivers/cpufreq/intel_pstate.c
-+++ b/drivers/cpufreq/intel_pstate.c
-@@ -51,6 +51,7 @@ struct sample {
-       int32_t core_pct_busy;
-       u64 aperf;
-       u64 mperf;
-+      unsigned long long tsc;
-       int freq;
- };
- 
-@@ -86,6 +87,7 @@ struct cpudata {
- 
-       u64     prev_aperf;
-       u64     prev_mperf;
-+      unsigned long long prev_tsc;
-       int     sample_ptr;
-       struct sample samples[SAMPLE_COUNT];
- };
-@@ -435,11 +437,17 @@ static inline void intel_pstate_calc_bus
-                                       struct sample *sample)
- {
-       u64 core_pct;
--      core_pct = div64_u64(int_tofp(sample->aperf * 100),
--                           sample->mperf);
--      sample->freq = fp_toint(cpu->pstate.max_pstate * core_pct * 1000);
-+      u64 c0_pct;
- 
--      sample->core_pct_busy = core_pct;
-+      core_pct = div64_u64(sample->aperf * 100, sample->mperf);
-+
-+      c0_pct = div64_u64(sample->mperf * 100, sample->tsc);
-+      sample->freq = fp_toint(
-+              mul_fp(int_tofp(cpu->pstate.max_pstate),
-+                      int_tofp(core_pct * 1000)));
-+
-+      sample->core_pct_busy = mul_fp(int_tofp(core_pct),
-+                              div_fp(int_tofp(c0_pct + 1), int_tofp(100)));
- }
- 
- static inline void intel_pstate_sample(struct cpudata *cpu)

diff --git a/queue-3.10/series b/queue-3.10/series
index b909455b49e8a30bd32ad1cdb91421739ad8831c..94f11910f500a5ec79e2ec00ec9642fd80fa4642 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -22,5 +22,4 @@ pinctrl-vt8500-change-devicetree-data-parsing.patch
 pinctrl-protect-pinctrl_list-add.patch
 mm-memory-failure.c-fix-memory-leak-in-successful-soft-offlining.patch
 ib-qib-convert-qib_user_sdma_pin_pages-to-use.patch
-intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.patch
 mm-fix-process-accidentally-killed-by-mce-because-of-huge-page-migration.patch

diff --git a/queue-3.12/intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.patch b/queue-3.12/intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.patch
deleted file mode 100644 (file)
index bc08ae1..0000000
--- a/queue-3.12/intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From fcb6a15c2e7e76d493e6f91ea889ab40e1c643a4 Mon Sep 17 00:00:00 2001
-From: Dirk Brandewie <dirk.j.brandewie@intel.com>
-Date: Mon, 3 Feb 2014 08:55:31 -0800
-Subject: intel_pstate: Take core C0 time into account for core busy calculation
-
-From: Dirk Brandewie <dirk.j.brandewie@intel.com>
-
-commit fcb6a15c2e7e76d493e6f91ea889ab40e1c643a4 upstream.
-
-Take non-idle time into account when calculating core busy time.
-This ensures that intel_pstate will notice a decrease in load.
-
-References: https://bugzilla.kernel.org/show_bug.cgi?id=66581
-Cc: 3.10+ <stable@vger.kernel.org> # 3.10+
-Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/cpufreq/intel_pstate.c |   16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
---- a/drivers/cpufreq/intel_pstate.c
-+++ b/drivers/cpufreq/intel_pstate.c
-@@ -51,6 +51,7 @@ struct sample {
-       int32_t core_pct_busy;
-       u64 aperf;
-       u64 mperf;
-+      unsigned long long tsc;
-       int freq;
- };
- 
-@@ -86,6 +87,7 @@ struct cpudata {
- 
-       u64     prev_aperf;
-       u64     prev_mperf;
-+      unsigned long long prev_tsc;
-       int     sample_ptr;
-       struct sample samples[SAMPLE_COUNT];
- };
-@@ -436,11 +438,17 @@ static inline void intel_pstate_calc_bus
-                                       struct sample *sample)
- {
-       u64 core_pct;
--      core_pct = div64_u64(int_tofp(sample->aperf * 100),
--                           sample->mperf);
--      sample->freq = fp_toint(cpu->pstate.max_pstate * core_pct * 1000);
-+      u64 c0_pct;
- 
--      sample->core_pct_busy = core_pct;
-+      core_pct = div64_u64(sample->aperf * 100, sample->mperf);
-+
-+      c0_pct = div64_u64(sample->mperf * 100, sample->tsc);
-+      sample->freq = fp_toint(
-+              mul_fp(int_tofp(cpu->pstate.max_pstate),
-+                      int_tofp(core_pct * 1000)));
-+
-+      sample->core_pct_busy = mul_fp(int_tofp(core_pct),
-+                              div_fp(int_tofp(c0_pct + 1), int_tofp(100)));
- }
- 
- static inline void intel_pstate_sample(struct cpudata *cpu)

diff --git a/queue-3.12/series b/queue-3.12/series
index a47e2f6a2322930c6ea6410c24181440c868bdd5..64270382a70d92e9e4a1d73b75fb15af58ea17ac 100644 (file)
--- a/queue-3.12/series
+++ b/queue-3.12/series
@@ -29,4 +29,3 @@ genirq-generic-irq-chip-requires-irq_domain.patch
 pinctrl-at91-use-locked-variant-of-irq_set_handler.patch
 pinctrl-vt8500-change-devicetree-data-parsing.patch
 pinctrl-protect-pinctrl_list-add.patch
-intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.patch

diff --git a/queue-3.13/intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.patch b/queue-3.13/intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.patch
deleted file mode 100644 (file)
index fe094df..0000000
--- a/queue-3.13/intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From fcb6a15c2e7e76d493e6f91ea889ab40e1c643a4 Mon Sep 17 00:00:00 2001
-From: Dirk Brandewie <dirk.j.brandewie@intel.com>
-Date: Mon, 3 Feb 2014 08:55:31 -0800
-Subject: intel_pstate: Take core C0 time into account for core busy calculation
-
-From: Dirk Brandewie <dirk.j.brandewie@intel.com>
-
-commit fcb6a15c2e7e76d493e6f91ea889ab40e1c643a4 upstream.
-
-Take non-idle time into account when calculating core busy time.
-This ensures that intel_pstate will notice a decrease in load.
-
-References: https://bugzilla.kernel.org/show_bug.cgi?id=66581
-Cc: 3.10+ <stable@vger.kernel.org> # 3.10+
-Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/cpufreq/intel_pstate.c |   16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
---- a/drivers/cpufreq/intel_pstate.c
-+++ b/drivers/cpufreq/intel_pstate.c
-@@ -54,6 +54,7 @@ struct sample {
-       int32_t core_pct_busy;
-       u64 aperf;
-       u64 mperf;
-+      unsigned long long tsc;
-       int freq;
- };
- 
-@@ -88,6 +89,7 @@ struct cpudata {
- 
-       u64     prev_aperf;
-       u64     prev_mperf;
-+      unsigned long long prev_tsc;
-       int     sample_ptr;
-       struct sample samples[SAMPLE_COUNT];
- };
-@@ -499,11 +501,17 @@ static inline void intel_pstate_calc_bus
-                                       struct sample *sample)
- {
-       u64 core_pct;
--      core_pct = div64_u64(int_tofp(sample->aperf * 100),
--                           sample->mperf);
--      sample->freq = fp_toint(cpu->pstate.max_pstate * core_pct * 1000);
-+      u64 c0_pct;
- 
--      sample->core_pct_busy = core_pct;
-+      core_pct = div64_u64(sample->aperf * 100, sample->mperf);
-+
-+      c0_pct = div64_u64(sample->mperf * 100, sample->tsc);
-+      sample->freq = fp_toint(
-+              mul_fp(int_tofp(cpu->pstate.max_pstate),
-+                      int_tofp(core_pct * 1000)));
-+
-+      sample->core_pct_busy = mul_fp(int_tofp(core_pct),
-+                              div_fp(int_tofp(c0_pct + 1), int_tofp(100)));
- }
- 
- static inline void intel_pstate_sample(struct cpudata *cpu)

diff --git a/queue-3.13/series b/queue-3.13/series
index 2a2725d93906c4be22a6150c0589f20b3b6a88d8..3f6acd141ffac870c1255eef2d85f1937c8cd101 100644 (file)
--- a/queue-3.13/series
+++ b/queue-3.13/series
@@ -36,5 +36,4 @@ pinctrl-imx27-fix-offset-calculation-in-imx_read_2bit.patch
 pinctrl-vt8500-change-devicetree-data-parsing.patch
 pinctrl-protect-pinctrl_list-add.patch
 bcache-fix-bug_on-due-to-integer-overflow-with-gc_sectors_used.patch
-intel_pstate-take-core-c0-time-into-account-for-core-busy-calculation.patch
 arm-imx6-initialize-low-power-mode-early-again.patch