![Sai Gurrappadi](/assets/img/avatar_default.png)
Currently, the userspace governor only updates frequency on GOV_LIMITS if policy->cur falls outside policy->{min/max}. However, it is also necessary to update current frequency on GOV_LIMITS to match the user requested value if it can be achieved within the new policy->{max/min}. This was previously the behaviour in the governor until commitd1922f0
("cpufreq: Simplify userspace governor") which incorrectly assumed that policy->cur == user requested frequency via scaling_setspeed. This won't be true if the user requested frequency falls outside policy->{min/max}. Ex: a temporary thermal cap throttled the user requested frequency. Fix this by storing the user requested frequency in a seperate variable. The governor will then try to achieve this request on every GOV_LIMITS change. Fixes:d1922f0256
(cpufreq: Simplify userspace governor) Signed-off-by: Sai Gurrappadi <sgurrappadi@nvidia.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
159 lines
3.9 KiB
C
159 lines
3.9 KiB
C
|
|
/*
|
|
* linux/drivers/cpufreq/cpufreq_userspace.c
|
|
*
|
|
* Copyright (C) 2001 Russell King
|
|
* (C) 2002 - 2004 Dominik Brodowski <linux@brodo.de>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/cpufreq.h>
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/slab.h>
|
|
|
|
static DEFINE_PER_CPU(unsigned int, cpu_is_managed);
|
|
static DEFINE_MUTEX(userspace_mutex);
|
|
|
|
/**
|
|
* cpufreq_set - set the CPU frequency
|
|
* @policy: pointer to policy struct where freq is being set
|
|
* @freq: target frequency in kHz
|
|
*
|
|
* Sets the CPU frequency to freq.
|
|
*/
|
|
static int cpufreq_set(struct cpufreq_policy *policy, unsigned int freq)
|
|
{
|
|
int ret = -EINVAL;
|
|
unsigned int *setspeed = policy->governor_data;
|
|
|
|
pr_debug("cpufreq_set for cpu %u, freq %u kHz\n", policy->cpu, freq);
|
|
|
|
mutex_lock(&userspace_mutex);
|
|
if (!per_cpu(cpu_is_managed, policy->cpu))
|
|
goto err;
|
|
|
|
*setspeed = freq;
|
|
|
|
ret = __cpufreq_driver_target(policy, freq, CPUFREQ_RELATION_L);
|
|
err:
|
|
mutex_unlock(&userspace_mutex);
|
|
return ret;
|
|
}
|
|
|
|
static ssize_t show_speed(struct cpufreq_policy *policy, char *buf)
|
|
{
|
|
return sprintf(buf, "%u\n", policy->cur);
|
|
}
|
|
|
|
static int cpufreq_userspace_policy_init(struct cpufreq_policy *policy)
|
|
{
|
|
unsigned int *setspeed;
|
|
|
|
setspeed = kzalloc(sizeof(*setspeed), GFP_KERNEL);
|
|
if (!setspeed)
|
|
return -ENOMEM;
|
|
|
|
policy->governor_data = setspeed;
|
|
return 0;
|
|
}
|
|
|
|
static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
|
|
unsigned int event)
|
|
{
|
|
unsigned int *setspeed = policy->governor_data;
|
|
unsigned int cpu = policy->cpu;
|
|
int rc = 0;
|
|
|
|
if (event == CPUFREQ_GOV_POLICY_INIT)
|
|
return cpufreq_userspace_policy_init(policy);
|
|
|
|
if (!setspeed)
|
|
return -EINVAL;
|
|
|
|
switch (event) {
|
|
case CPUFREQ_GOV_POLICY_EXIT:
|
|
mutex_lock(&userspace_mutex);
|
|
policy->governor_data = NULL;
|
|
kfree(setspeed);
|
|
mutex_unlock(&userspace_mutex);
|
|
break;
|
|
case CPUFREQ_GOV_START:
|
|
BUG_ON(!policy->cur);
|
|
pr_debug("started managing cpu %u\n", cpu);
|
|
|
|
mutex_lock(&userspace_mutex);
|
|
per_cpu(cpu_is_managed, cpu) = 1;
|
|
*setspeed = policy->cur;
|
|
mutex_unlock(&userspace_mutex);
|
|
break;
|
|
case CPUFREQ_GOV_STOP:
|
|
pr_debug("managing cpu %u stopped\n", cpu);
|
|
|
|
mutex_lock(&userspace_mutex);
|
|
per_cpu(cpu_is_managed, cpu) = 0;
|
|
*setspeed = 0;
|
|
mutex_unlock(&userspace_mutex);
|
|
break;
|
|
case CPUFREQ_GOV_LIMITS:
|
|
mutex_lock(&userspace_mutex);
|
|
pr_debug("limit event for cpu %u: %u - %u kHz, currently %u kHz, last set to %u kHz\n",
|
|
cpu, policy->min, policy->max, policy->cur, *setspeed);
|
|
|
|
if (policy->max < *setspeed)
|
|
__cpufreq_driver_target(policy, policy->max,
|
|
CPUFREQ_RELATION_H);
|
|
else if (policy->min > *setspeed)
|
|
__cpufreq_driver_target(policy, policy->min,
|
|
CPUFREQ_RELATION_L);
|
|
else
|
|
__cpufreq_driver_target(policy, *setspeed,
|
|
CPUFREQ_RELATION_L);
|
|
mutex_unlock(&userspace_mutex);
|
|
break;
|
|
}
|
|
return rc;
|
|
}
|
|
|
|
static struct cpufreq_governor cpufreq_gov_userspace = {
|
|
.name = "userspace",
|
|
.governor = cpufreq_governor_userspace,
|
|
.store_setspeed = cpufreq_set,
|
|
.show_setspeed = show_speed,
|
|
.owner = THIS_MODULE,
|
|
};
|
|
|
|
static int __init cpufreq_gov_userspace_init(void)
|
|
{
|
|
return cpufreq_register_governor(&cpufreq_gov_userspace);
|
|
}
|
|
|
|
static void __exit cpufreq_gov_userspace_exit(void)
|
|
{
|
|
cpufreq_unregister_governor(&cpufreq_gov_userspace);
|
|
}
|
|
|
|
MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>, "
|
|
"Russell King <rmk@arm.linux.org.uk>");
|
|
MODULE_DESCRIPTION("CPUfreq policy governor 'userspace'");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE
|
|
struct cpufreq_governor *cpufreq_default_governor(void)
|
|
{
|
|
return &cpufreq_gov_userspace;
|
|
}
|
|
|
|
fs_initcall(cpufreq_gov_userspace_init);
|
|
#else
|
|
module_init(cpufreq_gov_userspace_init);
|
|
#endif
|
|
module_exit(cpufreq_gov_userspace_exit);
|