From: Todd Poynor <toddpoy...@google.com>
The explicit hint on/off version.
Change-Id: Ibf62b6d45bf6fb8c9c055b9bdaf074ce9374c04f
Signed-off-by: Todd Poynor <toddpoy...@google.com>
Signed-off-by: Bálint Czobor <czoborbal...@gmail.com>
---
Documentation/cpu-freq/governors.txt | 3 ++
drivers/cpufreq/cpufreq_interactive.c | 48 +++++++++++++++++++++++++---
include/trace/events/cpufreq_interactive.h | 13 ++++++++
3 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/Documentation/cpu-freq/governors.txt
b/Documentation/cpu-freq/governors.txt
index 4172cad..4fcaa43 100644
--- a/Documentation/cpu-freq/governors.txt
+++ b/Documentation/cpu-freq/governors.txt
@@ -267,6 +267,9 @@ not idle. Default is 20000 uS.
input_boost: If non-zero, boost speed of all CPUs to hispeed_freq on
touchscreen activity. Default is 0.
+boost: If non-zero, immediately boost speed of all CPUs to
+hispeed_freq. If zero, allow CPU speeds to drop below hispeed_freq.
+
3. The Governor Interface in the CPUfreq Core
=============================================
diff --git a/drivers/cpufreq/cpufreq_interactive.c
b/drivers/cpufreq/cpufreq_interactive.c
index 90db2c3..07b7caf 100644
--- a/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@ -31,12 +31,11 @@
#include <linux/mutex.h>
#include <linux/slab.h>
#include <linux/input.h>
+#include <asm/cputime.h>
#define CREATE_TRACE_POINTS
#include <trace/events/cpufreq_interactive.h>
-#include <asm/cputime.h>
-
static atomic_t active_count = ATOMIC_INIT(0);
struct cpufreq_interactive_cpuinfo {
@@ -94,7 +93,7 @@ static unsigned long timer_rate;
static unsigned long above_hispeed_delay_val;
/*
- * Boost to hispeed on touchscreen input.
+ * Boost pulse to hispeed on touchscreen input.
*/
static int input_boost_val;
@@ -106,6 +105,12 @@ struct cpufreq_interactive_inputopen {
static struct cpufreq_interactive_inputopen inputopen;
+/*
+ * Non-zero means longer-term speed boost active.
+ */
+
+static int boost_val;
+
static int cpufreq_governor_interactive(struct cpufreq_policy *policy,
unsigned int event);
@@ -189,7 +194,7 @@ static void cpufreq_interactive_timer(unsigned long data)
if (load_since_change > cpu_load)
cpu_load = load_since_change;
- if (cpu_load >= go_hispeed_load) {
+ if (cpu_load >= go_hispeed_load || boost_val) {
if (pcpu->target_freq <= pcpu->policy->min) {
new_freq = hispeed_freq;
} else {
@@ -517,6 +522,12 @@ static void cpufreq_interactive_boost(void)
wake_up_process(up_task);
}
+/*
+ * Pulsed boost on input event raises CPUs to hispeed_freq and lets
+ * usual algorithm of min_sample_time decide when to allow speed
+ * to drop.
+ */
+
static void cpufreq_interactive_input_event(struct input_handle *handle,
unsigned int type,
unsigned int code, int value)
@@ -732,6 +743,34 @@ static ssize_t store_input_boost(struct kobject *kobj,
struct attribute *attr,
define_one_global_rw(input_boost);
+static ssize_t show_boost(struct kobject *kobj, struct attribute *attr,
+ char *buf)
+{
+ return sprintf(buf, "%d\n", boost_val);
+}
+
+static ssize_t store_boost(struct kobject *kobj, struct attribute *attr,
+ const char *buf, size_t count)
+{
+ int ret;
+ unsigned long val;
+
+ ret = kstrtoul(buf, 0, &val);
+ if (ret < 0)
+ return ret;
+
+ boost_val = val;
+
+ if (boost_val)
+ cpufreq_interactive_boost();
+ else
+ trace_cpufreq_interactive_unboost(hispeed_freq);
+
+ return count;
+}
+
+define_one_global_rw(boost);
+
static struct attribute *interactive_attributes[] = {
&hispeed_freq_attr.attr,
&go_hispeed_load_attr.attr,
@@ -739,6 +778,7 @@ static struct attribute *interactive_attributes[] = {
&min_sample_time_attr.attr,
&timer_rate_attr.attr,
&input_boost.attr,
+ &boost.attr,
NULL,
};
diff --git a/include/trace/events/cpufreq_interactive.h
b/include/trace/events/cpufreq_interactive.h
index 19e070b..ae6f232 100644
--- a/include/trace/events/cpufreq_interactive.h
+++ b/include/trace/events/cpufreq_interactive.h
@@ -93,6 +93,19 @@ TRACE_EVENT(cpufreq_interactive_boost,
),
TP_printk("freq=%lu", __entry->freq)
);
+
+TRACE_EVENT(cpufreq_interactive_unboost,
+ TP_PROTO(unsigned long freq),
+ TP_ARGS(freq),
+ TP_STRUCT__entry(
+ __field(unsigned long, freq)
+ ),
+ TP_fast_assign(
+ __entry->freq = freq;
+ ),
+ TP_printk("freq=%lu", __entry->freq)
+);
+
#endif /* _TRACE_CPUFREQ_INTERACTIVE_H */
/* This part must be outside protection */
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
