mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 09:50:04 +00:00
Merge branch 'pm-opp'
* pm-opp: PM / OPP: Drop unlikely before IS_ERR(_OR_NULL) PM / OPP: Fix static checker warning (broken 64bit big endian systems) PM / OPP: Free resources and properly return error on failure cpufreq-dt: make scaling_boost_freqs sysfs attr available when boost is enabled cpufreq: dt: Add support for turbo/boost mode cpufreq: dt: Add support for operating-points-v2 bindings cpufreq: Allow drivers to enable boost support after registering driver cpufreq: Update boost flag while initializing freq table from OPPs PM / OPP: add dev_pm_opp_is_turbo() helper PM / OPP: Add helpers for initializing CPU OPPs PM / OPP: Add support for opp-suspend PM / OPP: Add OPP sharing information to OPP library PM / OPP: Add clock-latency-ns support PM / OPP: Add support to parse "operating-points-v2" bindings PM / OPP: Break _opp_add_dynamic() into smaller functions PM / OPP: Allocate dev_opp from _add_device_opp() PM / OPP: Create _remove_device_opp() for freeing dev_opp PM / OPP: Relocate few routines PM / OPP: Create a directory for opp bindings PM / OPP: Update bindings to make opp-hz a 64 bit value
This commit is contained in:
commit
ac2a29c8a4
8 changed files with 1048 additions and 260 deletions
|
@ -88,7 +88,7 @@ This defines voltage-current-frequency combinations along with other related
|
||||||
properties.
|
properties.
|
||||||
|
|
||||||
Required properties:
|
Required properties:
|
||||||
- opp-hz: Frequency in Hz
|
- opp-hz: Frequency in Hz, expressed as a 64-bit big-endian integer.
|
||||||
|
|
||||||
Optional properties:
|
Optional properties:
|
||||||
- opp-microvolt: voltage in micro Volts.
|
- opp-microvolt: voltage in micro Volts.
|
||||||
|
@ -158,20 +158,20 @@ Example 1: Single cluster Dual-core ARM cortex A9, switch DVFS states together.
|
||||||
opp-shared;
|
opp-shared;
|
||||||
|
|
||||||
opp00 {
|
opp00 {
|
||||||
opp-hz = <1000000000>;
|
opp-hz = /bits/ 64 <1000000000>;
|
||||||
opp-microvolt = <970000 975000 985000>;
|
opp-microvolt = <970000 975000 985000>;
|
||||||
opp-microamp = <70000>;
|
opp-microamp = <70000>;
|
||||||
clock-latency-ns = <300000>;
|
clock-latency-ns = <300000>;
|
||||||
opp-suspend;
|
opp-suspend;
|
||||||
};
|
};
|
||||||
opp01 {
|
opp01 {
|
||||||
opp-hz = <1100000000>;
|
opp-hz = /bits/ 64 <1100000000>;
|
||||||
opp-microvolt = <980000 1000000 1010000>;
|
opp-microvolt = <980000 1000000 1010000>;
|
||||||
opp-microamp = <80000>;
|
opp-microamp = <80000>;
|
||||||
clock-latency-ns = <310000>;
|
clock-latency-ns = <310000>;
|
||||||
};
|
};
|
||||||
opp02 {
|
opp02 {
|
||||||
opp-hz = <1200000000>;
|
opp-hz = /bits/ 64 <1200000000>;
|
||||||
opp-microvolt = <1025000>;
|
opp-microvolt = <1025000>;
|
||||||
clock-latency-ns = <290000>;
|
clock-latency-ns = <290000>;
|
||||||
turbo-mode;
|
turbo-mode;
|
||||||
|
@ -237,20 +237,20 @@ independently.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
opp00 {
|
opp00 {
|
||||||
opp-hz = <1000000000>;
|
opp-hz = /bits/ 64 <1000000000>;
|
||||||
opp-microvolt = <970000 975000 985000>;
|
opp-microvolt = <970000 975000 985000>;
|
||||||
opp-microamp = <70000>;
|
opp-microamp = <70000>;
|
||||||
clock-latency-ns = <300000>;
|
clock-latency-ns = <300000>;
|
||||||
opp-suspend;
|
opp-suspend;
|
||||||
};
|
};
|
||||||
opp01 {
|
opp01 {
|
||||||
opp-hz = <1100000000>;
|
opp-hz = /bits/ 64 <1100000000>;
|
||||||
opp-microvolt = <980000 1000000 1010000>;
|
opp-microvolt = <980000 1000000 1010000>;
|
||||||
opp-microamp = <80000>;
|
opp-microamp = <80000>;
|
||||||
clock-latency-ns = <310000>;
|
clock-latency-ns = <310000>;
|
||||||
};
|
};
|
||||||
opp02 {
|
opp02 {
|
||||||
opp-hz = <1200000000>;
|
opp-hz = /bits/ 64 <1200000000>;
|
||||||
opp-microvolt = <1025000>;
|
opp-microvolt = <1025000>;
|
||||||
opp-microamp = <90000;
|
opp-microamp = <90000;
|
||||||
lock-latency-ns = <290000>;
|
lock-latency-ns = <290000>;
|
||||||
|
@ -313,20 +313,20 @@ DVFS state together.
|
||||||
opp-shared;
|
opp-shared;
|
||||||
|
|
||||||
opp00 {
|
opp00 {
|
||||||
opp-hz = <1000000000>;
|
opp-hz = /bits/ 64 <1000000000>;
|
||||||
opp-microvolt = <970000 975000 985000>;
|
opp-microvolt = <970000 975000 985000>;
|
||||||
opp-microamp = <70000>;
|
opp-microamp = <70000>;
|
||||||
clock-latency-ns = <300000>;
|
clock-latency-ns = <300000>;
|
||||||
opp-suspend;
|
opp-suspend;
|
||||||
};
|
};
|
||||||
opp01 {
|
opp01 {
|
||||||
opp-hz = <1100000000>;
|
opp-hz = /bits/ 64 <1100000000>;
|
||||||
opp-microvolt = <980000 1000000 1010000>;
|
opp-microvolt = <980000 1000000 1010000>;
|
||||||
opp-microamp = <80000>;
|
opp-microamp = <80000>;
|
||||||
clock-latency-ns = <310000>;
|
clock-latency-ns = <310000>;
|
||||||
};
|
};
|
||||||
opp02 {
|
opp02 {
|
||||||
opp-hz = <1200000000>;
|
opp-hz = /bits/ 64 <1200000000>;
|
||||||
opp-microvolt = <1025000>;
|
opp-microvolt = <1025000>;
|
||||||
opp-microamp = <90000>;
|
opp-microamp = <90000>;
|
||||||
clock-latency-ns = <290000>;
|
clock-latency-ns = <290000>;
|
||||||
|
@ -339,20 +339,20 @@ DVFS state together.
|
||||||
opp-shared;
|
opp-shared;
|
||||||
|
|
||||||
opp10 {
|
opp10 {
|
||||||
opp-hz = <1300000000>;
|
opp-hz = /bits/ 64 <1300000000>;
|
||||||
opp-microvolt = <1045000 1050000 1055000>;
|
opp-microvolt = <1045000 1050000 1055000>;
|
||||||
opp-microamp = <95000>;
|
opp-microamp = <95000>;
|
||||||
clock-latency-ns = <400000>;
|
clock-latency-ns = <400000>;
|
||||||
opp-suspend;
|
opp-suspend;
|
||||||
};
|
};
|
||||||
opp11 {
|
opp11 {
|
||||||
opp-hz = <1400000000>;
|
opp-hz = /bits/ 64 <1400000000>;
|
||||||
opp-microvolt = <1075000>;
|
opp-microvolt = <1075000>;
|
||||||
opp-microamp = <100000>;
|
opp-microamp = <100000>;
|
||||||
clock-latency-ns = <400000>;
|
clock-latency-ns = <400000>;
|
||||||
};
|
};
|
||||||
opp12 {
|
opp12 {
|
||||||
opp-hz = <1500000000>;
|
opp-hz = /bits/ 64 <1500000000>;
|
||||||
opp-microvolt = <1010000 1100000 1110000>;
|
opp-microvolt = <1010000 1100000 1110000>;
|
||||||
opp-microamp = <95000>;
|
opp-microamp = <95000>;
|
||||||
clock-latency-ns = <400000>;
|
clock-latency-ns = <400000>;
|
||||||
|
@ -379,7 +379,7 @@ Example 4: Handling multiple regulators
|
||||||
opp-shared;
|
opp-shared;
|
||||||
|
|
||||||
opp00 {
|
opp00 {
|
||||||
opp-hz = <1000000000>;
|
opp-hz = /bits/ 64 <1000000000>;
|
||||||
opp-microvolt = <970000>, /* Supply 0 */
|
opp-microvolt = <970000>, /* Supply 0 */
|
||||||
<960000>, /* Supply 1 */
|
<960000>, /* Supply 1 */
|
||||||
<960000>; /* Supply 2 */
|
<960000>; /* Supply 2 */
|
||||||
|
@ -392,7 +392,7 @@ Example 4: Handling multiple regulators
|
||||||
/* OR */
|
/* OR */
|
||||||
|
|
||||||
opp00 {
|
opp00 {
|
||||||
opp-hz = <1000000000>;
|
opp-hz = /bits/ 64 <1000000000>;
|
||||||
opp-microvolt = <970000 975000 985000>, /* Supply 0 */
|
opp-microvolt = <970000 975000 985000>, /* Supply 0 */
|
||||||
<960000 965000 975000>, /* Supply 1 */
|
<960000 965000 975000>, /* Supply 1 */
|
||||||
<960000 965000 975000>; /* Supply 2 */
|
<960000 965000 975000>; /* Supply 2 */
|
||||||
|
@ -405,7 +405,7 @@ Example 4: Handling multiple regulators
|
||||||
/* OR */
|
/* OR */
|
||||||
|
|
||||||
opp00 {
|
opp00 {
|
||||||
opp-hz = <1000000000>;
|
opp-hz = /bits/ 64 <1000000000>;
|
||||||
opp-microvolt = <970000 975000 985000>, /* Supply 0 */
|
opp-microvolt = <970000 975000 985000>, /* Supply 0 */
|
||||||
<960000 965000 975000>, /* Supply 1 */
|
<960000 965000 975000>, /* Supply 1 */
|
||||||
<960000 965000 975000>; /* Supply 2 */
|
<960000 965000 975000>; /* Supply 2 */
|
||||||
|
@ -437,12 +437,12 @@ Example 5: Multiple OPP tables
|
||||||
opp-shared;
|
opp-shared;
|
||||||
|
|
||||||
opp00 {
|
opp00 {
|
||||||
opp-hz = <600000000>;
|
opp-hz = /bits/ 64 <600000000>;
|
||||||
...
|
...
|
||||||
};
|
};
|
||||||
|
|
||||||
opp01 {
|
opp01 {
|
||||||
opp-hz = <800000000>;
|
opp-hz = /bits/ 64 <800000000>;
|
||||||
...
|
...
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -453,12 +453,12 @@ Example 5: Multiple OPP tables
|
||||||
opp-shared;
|
opp-shared;
|
||||||
|
|
||||||
opp10 {
|
opp10 {
|
||||||
opp-hz = <1000000000>;
|
opp-hz = /bits/ 64 <1000000000>;
|
||||||
...
|
...
|
||||||
};
|
};
|
||||||
|
|
||||||
opp11 {
|
opp11 {
|
||||||
opp-hz = <1100000000>;
|
opp-hz = /bits/ 64 <1100000000>;
|
||||||
...
|
...
|
||||||
};
|
};
|
||||||
};
|
};
|
File diff suppressed because it is too large
Load diff
|
@ -36,6 +36,12 @@ struct private_data {
|
||||||
unsigned int voltage_tolerance; /* in percentage */
|
unsigned int voltage_tolerance; /* in percentage */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static struct freq_attr *cpufreq_dt_attr[] = {
|
||||||
|
&cpufreq_freq_attr_scaling_available_freqs,
|
||||||
|
NULL, /* Extra space for boost-attr if required */
|
||||||
|
NULL,
|
||||||
|
};
|
||||||
|
|
||||||
static int set_target(struct cpufreq_policy *policy, unsigned int index)
|
static int set_target(struct cpufreq_policy *policy, unsigned int index)
|
||||||
{
|
{
|
||||||
struct dev_pm_opp *opp;
|
struct dev_pm_opp *opp;
|
||||||
|
@ -184,7 +190,6 @@ static int allocate_resources(int cpu, struct device **cdev,
|
||||||
|
|
||||||
static int cpufreq_init(struct cpufreq_policy *policy)
|
static int cpufreq_init(struct cpufreq_policy *policy)
|
||||||
{
|
{
|
||||||
struct cpufreq_dt_platform_data *pd;
|
|
||||||
struct cpufreq_frequency_table *freq_table;
|
struct cpufreq_frequency_table *freq_table;
|
||||||
struct device_node *np;
|
struct device_node *np;
|
||||||
struct private_data *priv;
|
struct private_data *priv;
|
||||||
|
@ -193,6 +198,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)
|
||||||
struct clk *cpu_clk;
|
struct clk *cpu_clk;
|
||||||
unsigned long min_uV = ~0, max_uV = 0;
|
unsigned long min_uV = ~0, max_uV = 0;
|
||||||
unsigned int transition_latency;
|
unsigned int transition_latency;
|
||||||
|
bool need_update = false;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = allocate_resources(policy->cpu, &cpu_dev, &cpu_reg, &cpu_clk);
|
ret = allocate_resources(policy->cpu, &cpu_dev, &cpu_reg, &cpu_clk);
|
||||||
|
@ -208,8 +214,47 @@ static int cpufreq_init(struct cpufreq_policy *policy)
|
||||||
goto out_put_reg_clk;
|
goto out_put_reg_clk;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* OPPs might be populated at runtime, don't check for error here */
|
/* Get OPP-sharing information from "operating-points-v2" bindings */
|
||||||
of_init_opp_table(cpu_dev);
|
ret = of_get_cpus_sharing_opps(cpu_dev, policy->cpus);
|
||||||
|
if (ret) {
|
||||||
|
/*
|
||||||
|
* operating-points-v2 not supported, fallback to old method of
|
||||||
|
* finding shared-OPPs for backward compatibility.
|
||||||
|
*/
|
||||||
|
if (ret == -ENOENT)
|
||||||
|
need_update = true;
|
||||||
|
else
|
||||||
|
goto out_node_put;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Initialize OPP tables for all policy->cpus. They will be shared by
|
||||||
|
* all CPUs which have marked their CPUs shared with OPP bindings.
|
||||||
|
*
|
||||||
|
* For platforms not using operating-points-v2 bindings, we do this
|
||||||
|
* before updating policy->cpus. Otherwise, we will end up creating
|
||||||
|
* duplicate OPPs for policy->cpus.
|
||||||
|
*
|
||||||
|
* OPPs might be populated at runtime, don't check for error here
|
||||||
|
*/
|
||||||
|
of_cpumask_init_opp_table(policy->cpus);
|
||||||
|
|
||||||
|
if (need_update) {
|
||||||
|
struct cpufreq_dt_platform_data *pd = cpufreq_get_driver_data();
|
||||||
|
|
||||||
|
if (!pd || !pd->independent_clocks)
|
||||||
|
cpumask_setall(policy->cpus);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* OPP tables are initialized only for policy->cpu, do it for
|
||||||
|
* others as well.
|
||||||
|
*/
|
||||||
|
set_cpus_sharing_opps(cpu_dev, policy->cpus);
|
||||||
|
|
||||||
|
of_property_read_u32(np, "clock-latency", &transition_latency);
|
||||||
|
} else {
|
||||||
|
transition_latency = dev_pm_opp_get_max_clock_latency(cpu_dev);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* But we need OPP table to function so if it is not there let's
|
* But we need OPP table to function so if it is not there let's
|
||||||
|
@ -230,7 +275,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)
|
||||||
|
|
||||||
of_property_read_u32(np, "voltage-tolerance", &priv->voltage_tolerance);
|
of_property_read_u32(np, "voltage-tolerance", &priv->voltage_tolerance);
|
||||||
|
|
||||||
if (of_property_read_u32(np, "clock-latency", &transition_latency))
|
if (!transition_latency)
|
||||||
transition_latency = CPUFREQ_ETERNAL;
|
transition_latency = CPUFREQ_ETERNAL;
|
||||||
|
|
||||||
if (!IS_ERR(cpu_reg)) {
|
if (!IS_ERR(cpu_reg)) {
|
||||||
|
@ -291,11 +336,16 @@ static int cpufreq_init(struct cpufreq_policy *policy)
|
||||||
goto out_free_cpufreq_table;
|
goto out_free_cpufreq_table;
|
||||||
}
|
}
|
||||||
|
|
||||||
policy->cpuinfo.transition_latency = transition_latency;
|
/* Support turbo/boost mode */
|
||||||
|
if (policy_has_boost_freq(policy)) {
|
||||||
|
/* This gets disabled by core on driver unregister */
|
||||||
|
ret = cpufreq_enable_boost_support();
|
||||||
|
if (ret)
|
||||||
|
goto out_free_cpufreq_table;
|
||||||
|
cpufreq_dt_attr[1] = &cpufreq_freq_attr_scaling_boost_freqs;
|
||||||
|
}
|
||||||
|
|
||||||
pd = cpufreq_get_driver_data();
|
policy->cpuinfo.transition_latency = transition_latency;
|
||||||
if (!pd || !pd->independent_clocks)
|
|
||||||
cpumask_setall(policy->cpus);
|
|
||||||
|
|
||||||
of_node_put(np);
|
of_node_put(np);
|
||||||
|
|
||||||
|
@ -306,7 +356,8 @@ static int cpufreq_init(struct cpufreq_policy *policy)
|
||||||
out_free_priv:
|
out_free_priv:
|
||||||
kfree(priv);
|
kfree(priv);
|
||||||
out_free_opp:
|
out_free_opp:
|
||||||
of_free_opp_table(cpu_dev);
|
of_cpumask_free_opp_table(policy->cpus);
|
||||||
|
out_node_put:
|
||||||
of_node_put(np);
|
of_node_put(np);
|
||||||
out_put_reg_clk:
|
out_put_reg_clk:
|
||||||
clk_put(cpu_clk);
|
clk_put(cpu_clk);
|
||||||
|
@ -322,7 +373,7 @@ static int cpufreq_exit(struct cpufreq_policy *policy)
|
||||||
|
|
||||||
cpufreq_cooling_unregister(priv->cdev);
|
cpufreq_cooling_unregister(priv->cdev);
|
||||||
dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
|
dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
|
||||||
of_free_opp_table(priv->cpu_dev);
|
of_cpumask_free_opp_table(policy->related_cpus);
|
||||||
clk_put(policy->clk);
|
clk_put(policy->clk);
|
||||||
if (!IS_ERR(priv->cpu_reg))
|
if (!IS_ERR(priv->cpu_reg))
|
||||||
regulator_put(priv->cpu_reg);
|
regulator_put(priv->cpu_reg);
|
||||||
|
@ -367,7 +418,7 @@ static struct cpufreq_driver dt_cpufreq_driver = {
|
||||||
.exit = cpufreq_exit,
|
.exit = cpufreq_exit,
|
||||||
.ready = cpufreq_ready,
|
.ready = cpufreq_ready,
|
||||||
.name = "cpufreq-dt",
|
.name = "cpufreq-dt",
|
||||||
.attr = cpufreq_generic_attr,
|
.attr = cpufreq_dt_attr,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int dt_cpufreq_probe(struct platform_device *pdev)
|
static int dt_cpufreq_probe(struct platform_device *pdev)
|
||||||
|
|
|
@ -2412,6 +2412,49 @@ int cpufreq_boost_supported(void)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(cpufreq_boost_supported);
|
EXPORT_SYMBOL_GPL(cpufreq_boost_supported);
|
||||||
|
|
||||||
|
static int create_boost_sysfs_file(void)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
if (!cpufreq_boost_supported())
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check if driver provides function to enable boost -
|
||||||
|
* if not, use cpufreq_boost_set_sw as default
|
||||||
|
*/
|
||||||
|
if (!cpufreq_driver->set_boost)
|
||||||
|
cpufreq_driver->set_boost = cpufreq_boost_set_sw;
|
||||||
|
|
||||||
|
ret = cpufreq_sysfs_create_file(&boost.attr);
|
||||||
|
if (ret)
|
||||||
|
pr_err("%s: cannot register global BOOST sysfs file\n",
|
||||||
|
__func__);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void remove_boost_sysfs_file(void)
|
||||||
|
{
|
||||||
|
if (cpufreq_boost_supported())
|
||||||
|
cpufreq_sysfs_remove_file(&boost.attr);
|
||||||
|
}
|
||||||
|
|
||||||
|
int cpufreq_enable_boost_support(void)
|
||||||
|
{
|
||||||
|
if (!cpufreq_driver)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
if (cpufreq_boost_supported())
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
cpufreq_driver->boost_supported = true;
|
||||||
|
|
||||||
|
/* This will get removed on driver unregister */
|
||||||
|
return create_boost_sysfs_file();
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(cpufreq_enable_boost_support);
|
||||||
|
|
||||||
int cpufreq_boost_enabled(void)
|
int cpufreq_boost_enabled(void)
|
||||||
{
|
{
|
||||||
return cpufreq_driver->boost_enabled;
|
return cpufreq_driver->boost_enabled;
|
||||||
|
@ -2465,21 +2508,9 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
|
||||||
if (driver_data->setpolicy)
|
if (driver_data->setpolicy)
|
||||||
driver_data->flags |= CPUFREQ_CONST_LOOPS;
|
driver_data->flags |= CPUFREQ_CONST_LOOPS;
|
||||||
|
|
||||||
if (cpufreq_boost_supported()) {
|
ret = create_boost_sysfs_file();
|
||||||
/*
|
if (ret)
|
||||||
* Check if driver provides function to enable boost -
|
goto err_null_driver;
|
||||||
* if not, use cpufreq_boost_set_sw as default
|
|
||||||
*/
|
|
||||||
if (!cpufreq_driver->set_boost)
|
|
||||||
cpufreq_driver->set_boost = cpufreq_boost_set_sw;
|
|
||||||
|
|
||||||
ret = cpufreq_sysfs_create_file(&boost.attr);
|
|
||||||
if (ret) {
|
|
||||||
pr_err("%s: cannot register global BOOST sysfs file\n",
|
|
||||||
__func__);
|
|
||||||
goto err_null_driver;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = subsys_interface_register(&cpufreq_interface);
|
ret = subsys_interface_register(&cpufreq_interface);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -2503,8 +2534,7 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
|
||||||
err_if_unreg:
|
err_if_unreg:
|
||||||
subsys_interface_unregister(&cpufreq_interface);
|
subsys_interface_unregister(&cpufreq_interface);
|
||||||
err_boost_unreg:
|
err_boost_unreg:
|
||||||
if (cpufreq_boost_supported())
|
remove_boost_sysfs_file();
|
||||||
cpufreq_sysfs_remove_file(&boost.attr);
|
|
||||||
err_null_driver:
|
err_null_driver:
|
||||||
write_lock_irqsave(&cpufreq_driver_lock, flags);
|
write_lock_irqsave(&cpufreq_driver_lock, flags);
|
||||||
cpufreq_driver = NULL;
|
cpufreq_driver = NULL;
|
||||||
|
@ -2533,9 +2563,7 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver)
|
||||||
/* Protect against concurrent cpu hotplug */
|
/* Protect against concurrent cpu hotplug */
|
||||||
get_online_cpus();
|
get_online_cpus();
|
||||||
subsys_interface_unregister(&cpufreq_interface);
|
subsys_interface_unregister(&cpufreq_interface);
|
||||||
if (cpufreq_boost_supported())
|
remove_boost_sysfs_file();
|
||||||
cpufreq_sysfs_remove_file(&boost.attr);
|
|
||||||
|
|
||||||
unregister_hotcpu_notifier(&cpufreq_cpu_notifier);
|
unregister_hotcpu_notifier(&cpufreq_cpu_notifier);
|
||||||
|
|
||||||
write_lock_irqsave(&cpufreq_driver_lock, flags);
|
write_lock_irqsave(&cpufreq_driver_lock, flags);
|
||||||
|
|
|
@ -75,6 +75,10 @@ int dev_pm_opp_init_cpufreq_table(struct device *dev,
|
||||||
}
|
}
|
||||||
freq_table[i].driver_data = i;
|
freq_table[i].driver_data = i;
|
||||||
freq_table[i].frequency = rate / 1000;
|
freq_table[i].frequency = rate / 1000;
|
||||||
|
|
||||||
|
/* Is Boost/turbo opp ? */
|
||||||
|
if (dev_pm_opp_is_turbo(opp))
|
||||||
|
freq_table[i].flags = CPUFREQ_BOOST_FREQ;
|
||||||
}
|
}
|
||||||
|
|
||||||
freq_table[i].driver_data = i;
|
freq_table[i].driver_data = i;
|
||||||
|
|
|
@ -18,6 +18,21 @@
|
||||||
* FREQUENCY TABLE HELPERS *
|
* FREQUENCY TABLE HELPERS *
|
||||||
*********************************************************************/
|
*********************************************************************/
|
||||||
|
|
||||||
|
bool policy_has_boost_freq(struct cpufreq_policy *policy)
|
||||||
|
{
|
||||||
|
struct cpufreq_frequency_table *pos, *table = policy->freq_table;
|
||||||
|
|
||||||
|
if (!table)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
cpufreq_for_each_valid_entry(pos, table)
|
||||||
|
if (pos->flags & CPUFREQ_BOOST_FREQ)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(policy_has_boost_freq);
|
||||||
|
|
||||||
int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
|
int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
|
||||||
struct cpufreq_frequency_table *table)
|
struct cpufreq_frequency_table *table)
|
||||||
{
|
{
|
||||||
|
|
|
@ -575,6 +575,8 @@ ssize_t cpufreq_show_cpus(const struct cpumask *mask, char *buf);
|
||||||
int cpufreq_boost_trigger_state(int state);
|
int cpufreq_boost_trigger_state(int state);
|
||||||
int cpufreq_boost_supported(void);
|
int cpufreq_boost_supported(void);
|
||||||
int cpufreq_boost_enabled(void);
|
int cpufreq_boost_enabled(void);
|
||||||
|
int cpufreq_enable_boost_support(void);
|
||||||
|
bool policy_has_boost_freq(struct cpufreq_policy *policy);
|
||||||
#else
|
#else
|
||||||
static inline int cpufreq_boost_trigger_state(int state)
|
static inline int cpufreq_boost_trigger_state(int state)
|
||||||
{
|
{
|
||||||
|
@ -588,12 +590,23 @@ static inline int cpufreq_boost_enabled(void)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline int cpufreq_enable_boost_support(void)
|
||||||
|
{
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool policy_has_boost_freq(struct cpufreq_policy *policy)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
/* the following funtion is for cpufreq core use only */
|
/* the following funtion is for cpufreq core use only */
|
||||||
struct cpufreq_frequency_table *cpufreq_frequency_get_table(unsigned int cpu);
|
struct cpufreq_frequency_table *cpufreq_frequency_get_table(unsigned int cpu);
|
||||||
|
|
||||||
/* the following are really really optional */
|
/* the following are really really optional */
|
||||||
extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs;
|
extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs;
|
||||||
|
extern struct freq_attr cpufreq_freq_attr_scaling_boost_freqs;
|
||||||
extern struct freq_attr *cpufreq_generic_attr[];
|
extern struct freq_attr *cpufreq_generic_attr[];
|
||||||
int cpufreq_table_validate_and_show(struct cpufreq_policy *policy,
|
int cpufreq_table_validate_and_show(struct cpufreq_policy *policy,
|
||||||
struct cpufreq_frequency_table *table);
|
struct cpufreq_frequency_table *table);
|
||||||
|
|
|
@ -30,7 +30,10 @@ unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp);
|
||||||
|
|
||||||
unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp);
|
unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp);
|
||||||
|
|
||||||
|
bool dev_pm_opp_is_turbo(struct dev_pm_opp *opp);
|
||||||
|
|
||||||
int dev_pm_opp_get_opp_count(struct device *dev);
|
int dev_pm_opp_get_opp_count(struct device *dev);
|
||||||
|
unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev);
|
||||||
|
|
||||||
struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
|
struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
|
||||||
unsigned long freq,
|
unsigned long freq,
|
||||||
|
@ -62,11 +65,21 @@ static inline unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline bool dev_pm_opp_is_turbo(struct dev_pm_opp *opp)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
static inline int dev_pm_opp_get_opp_count(struct device *dev)
|
static inline int dev_pm_opp_get_opp_count(struct device *dev)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
|
static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
|
||||||
unsigned long freq, bool available)
|
unsigned long freq, bool available)
|
||||||
{
|
{
|
||||||
|
@ -115,6 +128,10 @@ static inline struct srcu_notifier_head *dev_pm_opp_get_notifier(
|
||||||
#if defined(CONFIG_PM_OPP) && defined(CONFIG_OF)
|
#if defined(CONFIG_PM_OPP) && defined(CONFIG_OF)
|
||||||
int of_init_opp_table(struct device *dev);
|
int of_init_opp_table(struct device *dev);
|
||||||
void of_free_opp_table(struct device *dev);
|
void of_free_opp_table(struct device *dev);
|
||||||
|
int of_cpumask_init_opp_table(cpumask_var_t cpumask);
|
||||||
|
void of_cpumask_free_opp_table(cpumask_var_t cpumask);
|
||||||
|
int of_get_cpus_sharing_opps(struct device *cpu_dev, cpumask_var_t cpumask);
|
||||||
|
int set_cpus_sharing_opps(struct device *cpu_dev, cpumask_var_t cpumask);
|
||||||
#else
|
#else
|
||||||
static inline int of_init_opp_table(struct device *dev)
|
static inline int of_init_opp_table(struct device *dev)
|
||||||
{
|
{
|
||||||
|
@ -124,6 +141,25 @@ static inline int of_init_opp_table(struct device *dev)
|
||||||
static inline void of_free_opp_table(struct device *dev)
|
static inline void of_free_opp_table(struct device *dev)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline int of_cpumask_init_opp_table(cpumask_var_t cpumask)
|
||||||
|
{
|
||||||
|
return -ENOSYS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void of_cpumask_free_opp_table(cpumask_var_t cpumask)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline int of_get_cpus_sharing_opps(struct device *cpu_dev, cpumask_var_t cpumask)
|
||||||
|
{
|
||||||
|
return -ENOSYS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline int set_cpus_sharing_opps(struct device *cpu_dev, cpumask_var_t cpumask)
|
||||||
|
{
|
||||||
|
return -ENOSYS;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* __LINUX_OPP_H__ */
|
#endif /* __LINUX_OPP_H__ */
|
||||||
|
|
Loading…
Reference in a new issue