From: Javi Merino <javi.merino@arm.com>
To: linux-pm@vger.kernel.org
Cc: "Ørjan Eide" <orjan.eide@arm.com>,
"MyungJoo Ham" <myungjoo.ham@samsung.com>,
"Kyungmin Park" <kyungmin.park@samsung.com>
Subject: [PATCH v2 1/4] PM / devfreq: Add function to set max/min frequency
Date: Mon, 13 Jul 2015 18:33:55 +0100 [thread overview]
Message-ID: <1436808838-23391-2-git-send-email-javi.merino@arm.com> (raw)
In-Reply-To: <1436808838-23391-1-git-send-email-javi.merino@arm.com>
From: Ørjan Eide <orjan.eide@arm.com>
Factor out the logic to set minimum and maximum frequency for the device
so that it can be used by other parts of the kernel.
Cc: MyungJoo Ham <myungjoo.ham@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Ørjan Eide <orjan.eide@arm.com>
---
Changes since v1:
- Rename devfreq_qos_set_[max|min] to devfreq_set_[max|min] as
suggested by MyungJoo Ham
drivers/devfreq/devfreq.c | 72 +++++++++++++++++++++++++++++++----------------
include/linux/devfreq.h | 13 +++++++++
2 files changed, 61 insertions(+), 24 deletions(-)
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index ca1b362d77e2..5b3f2f32f1e5 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -768,6 +768,48 @@ err_out:
}
EXPORT_SYMBOL(devfreq_remove_governor);
+int devfreq_set_max(struct devfreq *df, unsigned long value)
+{
+ unsigned long min;
+ int ret = 0;
+
+ mutex_lock(&df->lock);
+ min = df->min_freq;
+ if (value && min && value < min) {
+ ret = -EINVAL;
+ goto unlock;
+ }
+
+ df->max_freq = value;
+ update_devfreq(df);
+unlock:
+ mutex_unlock(&df->lock);
+
+ return ret;
+}
+EXPORT_SYMBOL(devfreq_set_max);
+
+int devfreq_set_min(struct devfreq *df, unsigned long value)
+{
+ unsigned long max;
+ int ret = 0;
+
+ mutex_lock(&df->lock);
+ max = df->max_freq;
+ if (value && max && value > max) {
+ ret = -EINVAL;
+ goto unlock;
+ }
+
+ df->min_freq = value;
+ update_devfreq(df);
+unlock:
+ mutex_unlock(&df->lock);
+
+ return ret;
+}
+EXPORT_SYMBOL(devfreq_set_min);
+
static ssize_t governor_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@@ -899,24 +941,15 @@ static ssize_t min_freq_store(struct device *dev, struct device_attribute *attr,
struct devfreq *df = to_devfreq(dev);
unsigned long value;
int ret;
- unsigned long max;
ret = sscanf(buf, "%lu", &value);
if (ret != 1)
return -EINVAL;
- mutex_lock(&df->lock);
- max = df->max_freq;
- if (value && max && value > max) {
- ret = -EINVAL;
- goto unlock;
- }
+ ret = devfreq_set_min(df, value);
+ if (!ret)
+ ret = count;
- df->min_freq = value;
- update_devfreq(df);
- ret = count;
-unlock:
- mutex_unlock(&df->lock);
return ret;
}
@@ -932,24 +965,15 @@ static ssize_t max_freq_store(struct device *dev, struct device_attribute *attr,
struct devfreq *df = to_devfreq(dev);
unsigned long value;
int ret;
- unsigned long min;
ret = sscanf(buf, "%lu", &value);
if (ret != 1)
return -EINVAL;
- mutex_lock(&df->lock);
- min = df->min_freq;
- if (value && min && value < min) {
- ret = -EINVAL;
- goto unlock;
- }
+ ret = devfreq_set_max(df, value);
+ if (!ret)
+ ret = count;
- df->max_freq = value;
- update_devfreq(df);
- ret = count;
-unlock:
- mutex_unlock(&df->lock);
return ret;
}
static DEVICE_ATTR_RW(min_freq);
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
index ce447f0f1bad..dce82c695955 100644
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
@@ -204,6 +204,9 @@ extern int devm_devfreq_register_opp_notifier(struct device *dev,
extern void devm_devfreq_unregister_opp_notifier(struct device *dev,
struct devfreq *devfreq);
+int devfreq_set_min(struct devfreq *df, unsigned long value);
+int devfreq_set_max(struct devfreq *df, unsigned long value);
+
#if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)
/**
* struct devfreq_simple_ondemand_data - void *data fed to struct devfreq
@@ -289,6 +292,16 @@ static inline void devm_devfreq_unregister_opp_notifier(struct device *dev,
struct devfreq *devfreq)
{
}
+
+static inline int devfreq_set_min(struct devfreq *df, unsigned long value)
+{
+ return -EINVAL;
+}
+
+static inline int devfreq_set_max(struct devfreq *df, unsigned long value)
+{
+ return -EINVAL;
+}
#endif /* CONFIG_PM_DEVFREQ */
#endif /* __LINUX_DEVFREQ_H__ */
--
1.9.1
next prev parent reply other threads:[~2015-07-13 17:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-13 17:33 [PATCH v2 0/4] Devfreq cooling device Javi Merino
2015-07-13 17:33 ` Javi Merino [this message]
2015-07-13 17:33 ` [PATCH v2 2/4] PM / devfreq: cache the last call to get_dev_status() Javi Merino
2015-07-13 17:33 ` [PATCH v2 3/4] thermal: Add devfreq cooling Javi Merino
2015-07-13 17:33 ` [PATCH v2 4/4] devfreq_cooling: add trace information Javi Merino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436808838-23391-2-git-send-email-javi.merino@arm.com \
--to=javi.merino@arm.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-pm@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=orjan.eide@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox