From: Zhang Rui <rui.zhang@intel.com>
To: linux-pm@vger.kernel.org
Cc: "hongbo.zhang" <hongbo.zhang@linaro.com>,
Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH 24/34] Thermal: Remove the cooling_cpufreq_list.
Date: Sun, 2 Dec 2012 22:44:58 +0800 [thread overview]
Message-ID: <1354459508-3707-24-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1354459508-3707-1-git-send-email-rui.zhang@intel.com>
From: "hongbo.zhang" <hongbo.zhang@linaro.com>
Problem of using this list is that the cpufreq_get_max_state callback will be
called when register cooling device by thermal_cooling_device_register, but
this list isn't ready at this moment. What's more, there is no need to maintain
such a list, we can get cpufreq_cooling_device instance by the private
thermal_cooling_device.devdata.
Signed-off-by: hongbo.zhang <hongbo.zhang@linaro.com>
Reviewed-by: Francesco Lavra <francescolavra.fl@gmail.com>
Reviewed-by: Amit Daniel Kachhap <amit.kachhap@linaro.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
drivers/thermal/cpu_cooling.c | 91 +++++++++--------------------------------
1 files changed, 19 insertions(+), 72 deletions(-)
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index bfd62b7..392d57d 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -58,8 +58,9 @@ struct cpufreq_cooling_device {
};
static LIST_HEAD(cooling_cpufreq_list);
static DEFINE_IDR(cpufreq_idr);
+static DEFINE_MUTEX(cooling_cpufreq_lock);
-static struct mutex cooling_cpufreq_lock;
+static unsigned int cpufreq_dev_count;
/* notify_table passes value to the CPUFREQ_ADJUST callback function. */
#define NOTIFY_INVALID NULL
@@ -240,28 +241,18 @@ static int cpufreq_thermal_notifier(struct notifier_block *nb,
static int cpufreq_get_max_state(struct thermal_cooling_device *cdev,
unsigned long *state)
{
- int ret = -EINVAL, i = 0;
- struct cpufreq_cooling_device *cpufreq_device;
- struct cpumask *maskPtr;
+ struct cpufreq_cooling_device *cpufreq_device = cdev->devdata;
+ struct cpumask *maskPtr = &cpufreq_device->allowed_cpus;
unsigned int cpu;
struct cpufreq_frequency_table *table;
unsigned long count = 0;
+ int i = 0;
- mutex_lock(&cooling_cpufreq_lock);
- list_for_each_entry(cpufreq_device, &cooling_cpufreq_list, node) {
- if (cpufreq_device && cpufreq_device->cool_dev == cdev)
- break;
- }
- if (cpufreq_device == NULL)
- goto return_get_max_state;
-
- maskPtr = &cpufreq_device->allowed_cpus;
cpu = cpumask_any(maskPtr);
table = cpufreq_frequency_get_table(cpu);
if (!table) {
*state = 0;
- ret = 0;
- goto return_get_max_state;
+ return 0;
}
for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {
@@ -272,12 +263,10 @@ static int cpufreq_get_max_state(struct thermal_cooling_device *cdev,
if (count > 0) {
*state = --count;
- ret = 0;
+ return 0;
}
-return_get_max_state:
- mutex_unlock(&cooling_cpufreq_lock);
- return ret;
+ return -EINVAL;
}
/**
@@ -288,20 +277,10 @@ static int cpufreq_get_max_state(struct thermal_cooling_device *cdev,
static int cpufreq_get_cur_state(struct thermal_cooling_device *cdev,
unsigned long *state)
{
- int ret = -EINVAL;
- struct cpufreq_cooling_device *cpufreq_device;
+ struct cpufreq_cooling_device *cpufreq_device = cdev->devdata;
- mutex_lock(&cooling_cpufreq_lock);
- list_for_each_entry(cpufreq_device, &cooling_cpufreq_list, node) {
- if (cpufreq_device && cpufreq_device->cool_dev == cdev) {
- *state = cpufreq_device->cpufreq_state;
- ret = 0;
- break;
- }
- }
- mutex_unlock(&cooling_cpufreq_lock);
-
- return ret;
+ *state = cpufreq_device->cpufreq_state;
+ return 0;
}
/**
@@ -312,22 +291,9 @@ static int cpufreq_get_cur_state(struct thermal_cooling_device *cdev,
static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev,
unsigned long state)
{
- int ret = -EINVAL;
- struct cpufreq_cooling_device *cpufreq_device;
+ struct cpufreq_cooling_device *cpufreq_device = cdev->devdata;
- mutex_lock(&cooling_cpufreq_lock);
- list_for_each_entry(cpufreq_device, &cooling_cpufreq_list, node) {
- if (cpufreq_device && cpufreq_device->cool_dev == cdev) {
- ret = 0;
- break;
- }
- }
- if (!ret)
- ret = cpufreq_apply_cooling(cpufreq_device, state);
-
- mutex_unlock(&cooling_cpufreq_lock);
-
- return ret;
+ return cpufreq_apply_cooling(cpufreq_device, state);
}
/* Bind cpufreq callbacks to thermal cooling device ops */
@@ -351,14 +317,11 @@ struct thermal_cooling_device *cpufreq_cooling_register(
{
struct thermal_cooling_device *cool_dev;
struct cpufreq_cooling_device *cpufreq_dev = NULL;
- unsigned int cpufreq_dev_count = 0, min = 0, max = 0;
+ unsigned int min = 0, max = 0;
char dev_name[THERMAL_NAME_LENGTH];
int ret = 0, i;
struct cpufreq_policy policy;
- list_for_each_entry(cpufreq_dev, &cooling_cpufreq_list, node)
- cpufreq_dev_count++;
-
/*Verify that all the clip cpus have same freq_min, freq_max limit*/
for_each_cpu(i, clip_cpus) {
/*continue if cpufreq policy not found and not return error*/
@@ -380,9 +343,6 @@ struct thermal_cooling_device *cpufreq_cooling_register(
cpumask_copy(&cpufreq_dev->allowed_cpus, clip_cpus);
- if (cpufreq_dev_count == 0)
- mutex_init(&cooling_cpufreq_lock);
-
ret = get_idr(&cpufreq_idr, &cpufreq_dev->id);
if (ret) {
kfree(cpufreq_dev);
@@ -401,12 +361,12 @@ struct thermal_cooling_device *cpufreq_cooling_register(
cpufreq_dev->cool_dev = cool_dev;
cpufreq_dev->cpufreq_state = 0;
mutex_lock(&cooling_cpufreq_lock);
- list_add_tail(&cpufreq_dev->node, &cooling_cpufreq_list);
/* Register the notifier for first cpufreq cooling device */
if (cpufreq_dev_count == 0)
cpufreq_register_notifier(&thermal_cpufreq_notifier_block,
CPUFREQ_POLICY_NOTIFIER);
+ cpufreq_dev_count++;
mutex_unlock(&cooling_cpufreq_lock);
return cool_dev;
@@ -419,33 +379,20 @@ EXPORT_SYMBOL(cpufreq_cooling_register);
*/
void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)
{
- struct cpufreq_cooling_device *cpufreq_dev = NULL;
- unsigned int cpufreq_dev_count = 0;
+ struct cpufreq_cooling_device *cpufreq_dev = cdev->devdata;
mutex_lock(&cooling_cpufreq_lock);
- list_for_each_entry(cpufreq_dev, &cooling_cpufreq_list, node) {
- if (cpufreq_dev && cpufreq_dev->cool_dev == cdev)
- break;
- cpufreq_dev_count++;
- }
-
- if (!cpufreq_dev || cpufreq_dev->cool_dev != cdev) {
- mutex_unlock(&cooling_cpufreq_lock);
- return;
- }
-
- list_del(&cpufreq_dev->node);
+ cpufreq_dev_count--;
/* Unregister the notifier for the last cpufreq cooling device */
- if (cpufreq_dev_count == 1) {
+ if (cpufreq_dev_count == 0) {
cpufreq_unregister_notifier(&thermal_cpufreq_notifier_block,
CPUFREQ_POLICY_NOTIFIER);
}
mutex_unlock(&cooling_cpufreq_lock);
+
thermal_cooling_device_unregister(cpufreq_dev->cool_dev);
release_idr(&cpufreq_idr, cpufreq_dev->id);
- if (cpufreq_dev_count == 1)
- mutex_destroy(&cooling_cpufreq_lock);
kfree(cpufreq_dev);
}
EXPORT_SYMBOL(cpufreq_cooling_unregister);
--
1.7.7.6
next prev parent reply other threads:[~2012-12-02 14:45 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-02 14:44 [PATCH 01/34] Thermal: Refactor thermal.h file Zhang Rui
2012-12-02 14:44 ` [PATCH 02/34] Thermal: Move thermal_instance to thermal_core.h Zhang Rui
2012-12-02 14:44 ` [PATCH 03/34] Thermal: Add get trend, get instance API's to thermal_sys Zhang Rui
2012-12-02 14:44 ` [PATCH 04/34] Thermal: Add platform level information to thermal.h Zhang Rui
2012-12-02 14:44 ` [PATCH 05/34] Thermal: Pass zone parameters as argument to tzd_register Zhang Rui
2012-12-02 14:44 ` [PATCH 06/34] Thermal: Add thermal governor registration APIs Zhang Rui
2012-12-02 14:44 ` [PATCH 07/34] Thermal: Add a policy sysfs attribute Zhang Rui
2012-12-02 14:44 ` [PATCH 08/34] Thermal: Update binding logic based on platform data Zhang Rui
2012-12-02 14:44 ` [PATCH 09/34] Thermal: Make thermal_cdev_update as a global function Zhang Rui
2012-12-02 14:44 ` [PATCH 10/34] Thermal: Introduce fair_share thermal governor Zhang Rui
2012-12-02 14:44 ` [PATCH 11/34] Thermal: Introduce a step_wise " Zhang Rui
2012-12-02 14:44 ` [PATCH 12/34] Thermal: Add a thermal notifier for user space Zhang Rui
2012-12-02 14:44 ` [PATCH 13/34] Thermal: Remove throttling logic out of thermal_sys.c Zhang Rui
2012-12-02 14:44 ` [PATCH 14/34] Thermal: Add a notification API Zhang Rui
2012-12-02 14:44 ` [PATCH 15/34] Thermal: Add documentation for platform layer data Zhang Rui
2012-12-02 14:44 ` [PATCH 16/34] Thermal: Provide option to choose default thermal governor Zhang Rui
2012-12-02 14:44 ` [PATCH 17/34] Thermal: Fix oops and unlocking in thermal_sys.c Zhang Rui
2012-12-02 14:44 ` [PATCH 18/34] thermal: step_wise: Add missing static storage class specifiers Zhang Rui
2012-12-02 14:44 ` [PATCH 19/34] thermal: fair_share: " Zhang Rui
2012-12-02 14:44 ` [PATCH 20/34] thermal: user_space: " Zhang Rui
2012-12-02 14:44 ` [PATCH 21/34] thermal: rcar_thermal: remove explicitly used devm_kfree/iounap() Zhang Rui
2012-12-02 14:44 ` [PATCH 22/34] Thermal: add indent for code alignment Zhang Rui
2012-12-02 14:44 ` [PATCH 23/34] Thermal: fix bug of counting cpu frequencies Zhang Rui
2012-12-02 14:44 ` Zhang Rui [this message]
2012-12-02 14:44 ` [PATCH 25/34] thermal: cpu_cooling: Make 'notify_device' static Zhang Rui
2012-12-02 14:45 ` [PATCH 26/34] Refactor drivers/thermal/Kconfig Zhang Rui
2012-12-02 14:45 ` [PATCH 27/34] Exynos: Add missing dependency Zhang Rui
2012-12-02 14:45 ` [PATCH 28/34] drivers/thermal/Makefile refactor Zhang Rui
2012-12-02 14:45 ` [PATCH 29/34] Thermal: Add ST-Ericsson DB8500 thermal driver Zhang Rui
2012-12-02 14:45 ` [PATCH 30/34] Thermal: Add ST-Ericsson DB8500 thermal properties and platform data Zhang Rui
2012-12-02 14:45 ` [PATCH 31/34] thermal: cpu cooling: use const parameter while registering Zhang Rui
2012-12-02 14:45 ` [PATCH 32/34] thermal: cpu cooling: allow module builds Zhang Rui
2012-12-02 14:45 ` [PATCH 33/34] thermal: rcar: fixup the unit of temperature Zhang Rui
2012-12-02 14:45 ` [PATCH 34/34] thermal: rcar: add rcar_zone_to_priv() macro Zhang Rui
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=1354459508-3707-24-git-send-email-rui.zhang@intel.com \
--to=rui.zhang@intel.com \
--cc=hongbo.zhang@linaro.com \
--cc=linux-pm@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).