Merge branches 'pm-cpufreq', 'pm-cpuidle' and 'pm-domains'
* pm-cpufreq: arm: imx: Add MODULE_ALIAS for cpufreq cpufreq: Add and use cpufreq_for_each_{valid_,}entry_idx() cpufreq: intel_pstate: Enable HWP during system resume on CPU0 cpufreq: scpi: fix error return code in scpi_cpufreq_init() cpufreq: scpi: fix static checker warning cdev isn't an ERR_PTR cpufreq: remove at32ap-cpufreq cpufreq: AMD: Ignore the check for ProcFeedback in ST/CZ cpufreq: Skip cpufreq resume if it's not suspended * pm-cpuidle: x86: PM: Make APM idle driver initialize polling state * pm-domains: PM / domains: Fix up domain-idle-states OF parsing
This commit is contained in:
commit
616f16093d
|
@ -291,3 +291,7 @@ For example:
|
|||
/* Do something with pos */
|
||||
pos->frequency = ...
|
||||
}
|
||||
|
||||
If you need to work with the position of pos within driver_freq_table,
|
||||
do not subtract the pointers, as it is quite costly. Instead, use the
|
||||
macros cpufreq_for_each_entry_idx() and cpufreq_for_each_valid_entry_idx().
|
||||
|
|
|
@ -2389,6 +2389,7 @@ static int __init apm_init(void)
|
|||
if (HZ != 100)
|
||||
idle_period = (idle_period * HZ) / 100;
|
||||
if (idle_threshold < 100) {
|
||||
cpuidle_poll_state_init(&apm_idle_driver);
|
||||
if (!cpuidle_register_driver(&apm_idle_driver))
|
||||
if (cpuidle_register_device(&apm_cpuidle_device))
|
||||
cpuidle_unregister_driver(&apm_idle_driver);
|
||||
|
|
|
@ -2290,6 +2290,38 @@ static int genpd_parse_state(struct genpd_power_state *genpd_state,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int genpd_iterate_idle_states(struct device_node *dn,
|
||||
struct genpd_power_state *states)
|
||||
{
|
||||
int ret;
|
||||
struct of_phandle_iterator it;
|
||||
struct device_node *np;
|
||||
int i = 0;
|
||||
|
||||
ret = of_count_phandle_with_args(dn, "domain-idle-states", NULL);
|
||||
if (ret <= 0)
|
||||
return ret;
|
||||
|
||||
/* Loop over the phandles until all the requested entry is found */
|
||||
of_for_each_phandle(&it, ret, dn, "domain-idle-states", NULL, 0) {
|
||||
np = it.node;
|
||||
if (!of_match_node(idle_state_match, np))
|
||||
continue;
|
||||
if (states) {
|
||||
ret = genpd_parse_state(&states[i], np);
|
||||
if (ret) {
|
||||
pr_err("Parsing idle state node %pOF failed with err %d\n",
|
||||
np, ret);
|
||||
of_node_put(np);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
/**
|
||||
* of_genpd_parse_idle_states: Return array of idle states for the genpd.
|
||||
*
|
||||
|
@ -2299,49 +2331,31 @@ static int genpd_parse_state(struct genpd_power_state *genpd_state,
|
|||
*
|
||||
* Returns the device states parsed from the OF node. The memory for the states
|
||||
* is allocated by this function and is the responsibility of the caller to
|
||||
* free the memory after use.
|
||||
* free the memory after use. If no domain idle states is found it returns
|
||||
* -EINVAL and in case of errors, a negative error code.
|
||||
*/
|
||||
int of_genpd_parse_idle_states(struct device_node *dn,
|
||||
struct genpd_power_state **states, int *n)
|
||||
{
|
||||
struct genpd_power_state *st;
|
||||
struct device_node *np;
|
||||
int i = 0;
|
||||
int err, ret;
|
||||
int count;
|
||||
struct of_phandle_iterator it;
|
||||
const struct of_device_id *match_id;
|
||||
int ret;
|
||||
|
||||
count = of_count_phandle_with_args(dn, "domain-idle-states", NULL);
|
||||
if (count <= 0)
|
||||
return -EINVAL;
|
||||
ret = genpd_iterate_idle_states(dn, NULL);
|
||||
if (ret <= 0)
|
||||
return ret < 0 ? ret : -EINVAL;
|
||||
|
||||
st = kcalloc(count, sizeof(*st), GFP_KERNEL);
|
||||
st = kcalloc(ret, sizeof(*st), GFP_KERNEL);
|
||||
if (!st)
|
||||
return -ENOMEM;
|
||||
|
||||
/* Loop over the phandles until all the requested entry is found */
|
||||
of_for_each_phandle(&it, err, dn, "domain-idle-states", NULL, 0) {
|
||||
np = it.node;
|
||||
match_id = of_match_node(idle_state_match, np);
|
||||
if (!match_id)
|
||||
continue;
|
||||
ret = genpd_parse_state(&st[i++], np);
|
||||
if (ret) {
|
||||
pr_err
|
||||
("Parsing idle state node %pOF failed with err %d\n",
|
||||
np, ret);
|
||||
of_node_put(np);
|
||||
kfree(st);
|
||||
return ret;
|
||||
}
|
||||
ret = genpd_iterate_idle_states(dn, st);
|
||||
if (ret <= 0) {
|
||||
kfree(st);
|
||||
return ret < 0 ? ret : -EINVAL;
|
||||
}
|
||||
|
||||
*n = i;
|
||||
if (!i)
|
||||
kfree(st);
|
||||
else
|
||||
*states = st;
|
||||
*states = st;
|
||||
*n = ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -239,16 +239,6 @@ if PPC32 || PPC64
|
|||
source "drivers/cpufreq/Kconfig.powerpc"
|
||||
endif
|
||||
|
||||
if AVR32
|
||||
config AVR32_AT32AP_CPUFREQ
|
||||
bool "CPU frequency driver for AT32AP"
|
||||
depends on PLATFORM_AT32AP
|
||||
default n
|
||||
help
|
||||
This enables the CPU frequency driver for AT32AP processors.
|
||||
If in doubt, say N.
|
||||
endif
|
||||
|
||||
if IA64
|
||||
config IA64_ACPI_CPUFREQ
|
||||
tristate "ACPI Processor P-States driver"
|
||||
|
|
|
@ -100,7 +100,6 @@ obj-$(CONFIG_POWERNV_CPUFREQ) += powernv-cpufreq.o
|
|||
|
||||
##################################################################################
|
||||
# Other platform drivers
|
||||
obj-$(CONFIG_AVR32_AT32AP_CPUFREQ) += at32ap-cpufreq.o
|
||||
obj-$(CONFIG_BFIN_CPU_FREQ) += blackfin-cpufreq.o
|
||||
obj-$(CONFIG_BMIPS_CPUFREQ) += bmips-cpufreq.o
|
||||
obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/percpu-defs.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/mod_devicetable.h>
|
||||
|
@ -109,12 +110,18 @@ out:
|
|||
static int __init amd_freq_sensitivity_init(void)
|
||||
{
|
||||
u64 val;
|
||||
struct pci_dev *pcidev;
|
||||
|
||||
if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
|
||||
return -ENODEV;
|
||||
|
||||
if (!static_cpu_has(X86_FEATURE_PROC_FEEDBACK))
|
||||
return -ENODEV;
|
||||
pcidev = pci_get_device(PCI_VENDOR_ID_AMD,
|
||||
PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, NULL);
|
||||
|
||||
if (!pcidev) {
|
||||
if (!static_cpu_has(X86_FEATURE_PROC_FEEDBACK))
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
if (rdmsrl_safe(MSR_AMD64_FREQ_SENSITIVITY_ACTUAL, &val))
|
||||
return -ENODEV;
|
||||
|
|
|
@ -1,127 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2004-2007 Atmel Corporation
|
||||
*
|
||||
* Based on MIPS implementation arch/mips/kernel/time.c
|
||||
* Copyright 2001 MontaVista Software Inc.
|
||||
*
|
||||
* 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 DEBUG*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/cpufreq.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
static struct cpufreq_frequency_table *freq_table;
|
||||
|
||||
static unsigned int ref_freq;
|
||||
static unsigned long loops_per_jiffy_ref;
|
||||
|
||||
static int at32_set_target(struct cpufreq_policy *policy, unsigned int index)
|
||||
{
|
||||
unsigned int old_freq, new_freq;
|
||||
|
||||
old_freq = policy->cur;
|
||||
new_freq = freq_table[index].frequency;
|
||||
|
||||
if (!ref_freq) {
|
||||
ref_freq = old_freq;
|
||||
loops_per_jiffy_ref = boot_cpu_data.loops_per_jiffy;
|
||||
}
|
||||
|
||||
if (old_freq < new_freq)
|
||||
boot_cpu_data.loops_per_jiffy = cpufreq_scale(
|
||||
loops_per_jiffy_ref, ref_freq, new_freq);
|
||||
clk_set_rate(policy->clk, new_freq * 1000);
|
||||
if (new_freq < old_freq)
|
||||
boot_cpu_data.loops_per_jiffy = cpufreq_scale(
|
||||
loops_per_jiffy_ref, ref_freq, new_freq);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int at32_cpufreq_driver_init(struct cpufreq_policy *policy)
|
||||
{
|
||||
unsigned int frequency, rate, min_freq;
|
||||
struct clk *cpuclk;
|
||||
int retval, steps, i;
|
||||
|
||||
if (policy->cpu != 0)
|
||||
return -EINVAL;
|
||||
|
||||
cpuclk = clk_get(NULL, "cpu");
|
||||
if (IS_ERR(cpuclk)) {
|
||||
pr_debug("cpufreq: could not get CPU clk\n");
|
||||
retval = PTR_ERR(cpuclk);
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
min_freq = (clk_round_rate(cpuclk, 1) + 500) / 1000;
|
||||
frequency = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
|
||||
policy->cpuinfo.transition_latency = 0;
|
||||
|
||||
/*
|
||||
* AVR32 CPU frequency rate scales in power of two between maximum and
|
||||
* minimum, also add space for the table end marker.
|
||||
*
|
||||
* Further validate that the frequency is usable, and append it to the
|
||||
* frequency table.
|
||||
*/
|
||||
steps = fls(frequency / min_freq) + 1;
|
||||
freq_table = kzalloc(steps * sizeof(struct cpufreq_frequency_table),
|
||||
GFP_KERNEL);
|
||||
if (!freq_table) {
|
||||
retval = -ENOMEM;
|
||||
goto out_err_put_clk;
|
||||
}
|
||||
|
||||
for (i = 0; i < (steps - 1); i++) {
|
||||
rate = clk_round_rate(cpuclk, frequency * 1000) / 1000;
|
||||
|
||||
if (rate != frequency)
|
||||
freq_table[i].frequency = CPUFREQ_ENTRY_INVALID;
|
||||
else
|
||||
freq_table[i].frequency = frequency;
|
||||
|
||||
frequency /= 2;
|
||||
}
|
||||
|
||||
policy->clk = cpuclk;
|
||||
freq_table[steps - 1].frequency = CPUFREQ_TABLE_END;
|
||||
|
||||
retval = cpufreq_table_validate_and_show(policy, freq_table);
|
||||
if (!retval) {
|
||||
printk("cpufreq: AT32AP CPU frequency driver\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
kfree(freq_table);
|
||||
out_err_put_clk:
|
||||
clk_put(cpuclk);
|
||||
out_err:
|
||||
return retval;
|
||||
}
|
||||
|
||||
static struct cpufreq_driver at32_driver = {
|
||||
.name = "at32ap",
|
||||
.init = at32_cpufreq_driver_init,
|
||||
.verify = cpufreq_generic_frequency_table_verify,
|
||||
.target_index = at32_set_target,
|
||||
.get = cpufreq_generic_get,
|
||||
.flags = CPUFREQ_STICKY,
|
||||
};
|
||||
|
||||
static int __init at32_cpufreq_init(void)
|
||||
{
|
||||
return cpufreq_register_driver(&at32_driver);
|
||||
}
|
||||
late_initcall(at32_cpufreq_init);
|
|
@ -1686,6 +1686,9 @@ void cpufreq_resume(void)
|
|||
if (!cpufreq_driver)
|
||||
return;
|
||||
|
||||
if (unlikely(!cpufreq_suspended))
|
||||
return;
|
||||
|
||||
cpufreq_suspended = false;
|
||||
|
||||
if (!has_target() && !cpufreq_driver->resume)
|
||||
|
|
|
@ -115,10 +115,10 @@ static struct cpufreq_freqs freqs;
|
|||
static int init_div_table(void)
|
||||
{
|
||||
struct cpufreq_frequency_table *pos, *freq_tbl = dvfs_info->freq_table;
|
||||
unsigned int tmp, clk_div, ema_div, freq, volt_id;
|
||||
unsigned int tmp, clk_div, ema_div, freq, volt_id, idx;
|
||||
struct dev_pm_opp *opp;
|
||||
|
||||
cpufreq_for_each_entry(pos, freq_tbl) {
|
||||
cpufreq_for_each_entry_idx(pos, freq_tbl, idx) {
|
||||
opp = dev_pm_opp_find_freq_exact(dvfs_info->dev,
|
||||
pos->frequency * 1000, true);
|
||||
if (IS_ERR(opp)) {
|
||||
|
@ -154,8 +154,7 @@ static int init_div_table(void)
|
|||
tmp = (clk_div | ema_div | (volt_id << P0_7_VDD_SHIFT)
|
||||
| ((freq / FREQ_UNIT) << P0_7_FREQ_SHIFT));
|
||||
|
||||
__raw_writel(tmp, dvfs_info->base + XMU_PMU_P0_7 + 4 *
|
||||
(pos - freq_tbl));
|
||||
__raw_writel(tmp, dvfs_info->base + XMU_PMU_P0_7 + 4 * idx);
|
||||
dev_pm_opp_put(opp);
|
||||
}
|
||||
|
||||
|
|
|
@ -143,10 +143,9 @@ int cpufreq_table_index_unsorted(struct cpufreq_policy *policy,
|
|||
break;
|
||||
}
|
||||
|
||||
cpufreq_for_each_valid_entry(pos, table) {
|
||||
cpufreq_for_each_valid_entry_idx(pos, table, i) {
|
||||
freq = pos->frequency;
|
||||
|
||||
i = pos - table;
|
||||
if ((freq < policy->min) || (freq > policy->max))
|
||||
continue;
|
||||
if (freq == target_freq) {
|
||||
|
@ -211,15 +210,16 @@ int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy,
|
|||
unsigned int freq)
|
||||
{
|
||||
struct cpufreq_frequency_table *pos, *table = policy->freq_table;
|
||||
int idx;
|
||||
|
||||
if (unlikely(!table)) {
|
||||
pr_debug("%s: Unable to find frequency table\n", __func__);
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
cpufreq_for_each_valid_entry(pos, table)
|
||||
cpufreq_for_each_valid_entry_idx(pos, table, idx)
|
||||
if (pos->frequency == freq)
|
||||
return pos - table;
|
||||
return idx;
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
|
@ -504,6 +504,7 @@ static struct platform_driver imx6q_cpufreq_platdrv = {
|
|||
};
|
||||
module_platform_driver(imx6q_cpufreq_platdrv);
|
||||
|
||||
MODULE_ALIAS("platform:imx6q-cpufreq");
|
||||
MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>");
|
||||
MODULE_DESCRIPTION("Freescale i.MX6Q cpufreq driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
|
@ -779,6 +779,8 @@ static int intel_pstate_hwp_save_state(struct cpufreq_policy *policy)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void intel_pstate_hwp_enable(struct cpudata *cpudata);
|
||||
|
||||
static int intel_pstate_resume(struct cpufreq_policy *policy)
|
||||
{
|
||||
if (!hwp_active)
|
||||
|
@ -786,6 +788,9 @@ static int intel_pstate_resume(struct cpufreq_policy *policy)
|
|||
|
||||
mutex_lock(&intel_pstate_limits_lock);
|
||||
|
||||
if (policy->cpu == 0)
|
||||
intel_pstate_hwp_enable(all_cpu_data[policy->cpu]);
|
||||
|
||||
all_cpu_data[policy->cpu]->epp_policy = 0;
|
||||
intel_pstate_hwp_set(policy->cpu);
|
||||
|
||||
|
|
|
@ -600,7 +600,7 @@ static void longhaul_setup_voltagescaling(void)
|
|||
/* Calculate kHz for one voltage step */
|
||||
kHz_step = (highest_speed - min_vid_speed) / numvscales;
|
||||
|
||||
cpufreq_for_each_entry(freq_pos, longhaul_table) {
|
||||
cpufreq_for_each_entry_idx(freq_pos, longhaul_table, j) {
|
||||
speed = freq_pos->frequency;
|
||||
if (speed > min_vid_speed)
|
||||
pos = (speed - min_vid_speed) / kHz_step + minvid.pos;
|
||||
|
@ -609,7 +609,7 @@ static void longhaul_setup_voltagescaling(void)
|
|||
freq_pos->driver_data |= mV_vrm_table[pos] << 8;
|
||||
vid = vrm_mV_table[mV_vrm_table[pos]];
|
||||
pr_info("f: %d kHz, index: %d, vid: %d mV\n",
|
||||
speed, (int)(freq_pos - longhaul_table), vid.mV);
|
||||
speed, j, vid.mV);
|
||||
}
|
||||
|
||||
can_scale_voltage = 1;
|
||||
|
|
|
@ -139,7 +139,7 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
|
|||
struct cpufreq_frequency_table *pos;
|
||||
const u32 *max_freqp;
|
||||
u32 max_freq;
|
||||
int cur_astate;
|
||||
int cur_astate, idx;
|
||||
struct resource res;
|
||||
struct device_node *cpu, *dn;
|
||||
int err = -ENODEV;
|
||||
|
@ -198,9 +198,9 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
|
|||
pr_debug("initializing frequency table\n");
|
||||
|
||||
/* initialize frequency table */
|
||||
cpufreq_for_each_entry(pos, pas_freqs) {
|
||||
cpufreq_for_each_entry_idx(pos, pas_freqs, idx) {
|
||||
pos->frequency = get_astate_freq(pos->driver_data) * 100000;
|
||||
pr_debug("%d: %d\n", (int)(pos - pas_freqs), pos->frequency);
|
||||
pr_debug("%d: %d\n", idx, pos->frequency);
|
||||
}
|
||||
|
||||
cur_astate = get_cur_astate(policy->cpu);
|
||||
|
|
|
@ -145,6 +145,7 @@ static int scpi_cpufreq_init(struct cpufreq_policy *policy)
|
|||
if (IS_ERR(priv->clk)) {
|
||||
dev_err(cpu_dev, "%s: Failed to get clk for cpu: %d\n",
|
||||
__func__, cpu_dev->id);
|
||||
ret = PTR_ERR(priv->clk);
|
||||
goto out_free_cpufreq_table;
|
||||
}
|
||||
|
||||
|
@ -197,11 +198,8 @@ static int scpi_cpufreq_exit(struct cpufreq_policy *policy)
|
|||
static void scpi_cpufreq_ready(struct cpufreq_policy *policy)
|
||||
{
|
||||
struct scpi_data *priv = policy->driver_data;
|
||||
struct thermal_cooling_device *cdev;
|
||||
|
||||
cdev = of_cpufreq_cooling_register(policy);
|
||||
if (!IS_ERR(cdev))
|
||||
priv->cdev = cdev;
|
||||
priv->cdev = of_cpufreq_cooling_register(policy);
|
||||
}
|
||||
|
||||
static struct cpufreq_driver scpi_cpufreq_driver = {
|
||||
|
|
|
@ -197,10 +197,11 @@ int clk_rate_table_find(struct clk *clk,
|
|||
unsigned long rate)
|
||||
{
|
||||
struct cpufreq_frequency_table *pos;
|
||||
int idx;
|
||||
|
||||
cpufreq_for_each_valid_entry(pos, freq_table)
|
||||
cpufreq_for_each_valid_entry_idx(pos, freq_table, idx)
|
||||
if (pos->frequency == rate)
|
||||
return pos - freq_table;
|
||||
return idx;
|
||||
|
||||
return -ENOENT;
|
||||
}
|
||||
|
|
|
@ -226,7 +226,7 @@ static u32 sh_sir_find_sclk(struct clk *irda_clk)
|
|||
clk_put(pclk);
|
||||
|
||||
/* IrDA can not set over peripheral_clk */
|
||||
cpufreq_for_each_valid_entry(pos, freq_table) {
|
||||
cpufreq_for_each_valid_entry_idx(pos, freq_table, index) {
|
||||
u32 freq = pos->frequency;
|
||||
|
||||
/* IrDA should not over peripheral_clk */
|
||||
|
@ -236,7 +236,7 @@ static u32 sh_sir_find_sclk(struct clk *irda_clk)
|
|||
tmp = freq % SCLK_BASE;
|
||||
if (tmp < min) {
|
||||
min = tmp;
|
||||
index = pos - freq_table;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -628,6 +628,18 @@ static inline void dev_pm_opp_free_cpufreq_table(struct device *dev,
|
|||
#define cpufreq_for_each_entry(pos, table) \
|
||||
for (pos = table; pos->frequency != CPUFREQ_TABLE_END; pos++)
|
||||
|
||||
/*
|
||||
* cpufreq_for_each_entry_idx - iterate over a cpufreq_frequency_table
|
||||
* with index
|
||||
* @pos: the cpufreq_frequency_table * to use as a loop cursor.
|
||||
* @table: the cpufreq_frequency_table * to iterate over.
|
||||
* @idx: the table entry currently being processed
|
||||
*/
|
||||
|
||||
#define cpufreq_for_each_entry_idx(pos, table, idx) \
|
||||
for (pos = table, idx = 0; pos->frequency != CPUFREQ_TABLE_END; \
|
||||
pos++, idx++)
|
||||
|
||||
/*
|
||||
* cpufreq_for_each_valid_entry - iterate over a cpufreq_frequency_table
|
||||
* excluding CPUFREQ_ENTRY_INVALID frequencies.
|
||||
|
@ -641,6 +653,21 @@ static inline void dev_pm_opp_free_cpufreq_table(struct device *dev,
|
|||
continue; \
|
||||
else
|
||||
|
||||
/*
|
||||
* cpufreq_for_each_valid_entry_idx - iterate with index over a cpufreq
|
||||
* frequency_table excluding CPUFREQ_ENTRY_INVALID frequencies.
|
||||
* @pos: the cpufreq_frequency_table * to use as a loop cursor.
|
||||
* @table: the cpufreq_frequency_table * to iterate over.
|
||||
* @idx: the table entry currently being processed
|
||||
*/
|
||||
|
||||
#define cpufreq_for_each_valid_entry_idx(pos, table, idx) \
|
||||
cpufreq_for_each_entry_idx(pos, table, idx) \
|
||||
if (pos->frequency == CPUFREQ_ENTRY_INVALID) \
|
||||
continue; \
|
||||
else
|
||||
|
||||
|
||||
int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
|
||||
struct cpufreq_frequency_table *table);
|
||||
|
||||
|
@ -667,19 +694,20 @@ static inline int cpufreq_table_find_index_al(struct cpufreq_policy *policy,
|
|||
unsigned int target_freq)
|
||||
{
|
||||
struct cpufreq_frequency_table *table = policy->freq_table;
|
||||
struct cpufreq_frequency_table *pos, *best = table - 1;
|
||||
struct cpufreq_frequency_table *pos;
|
||||
unsigned int freq;
|
||||
int idx, best = -1;
|
||||
|
||||
cpufreq_for_each_valid_entry(pos, table) {
|
||||
cpufreq_for_each_valid_entry_idx(pos, table, idx) {
|
||||
freq = pos->frequency;
|
||||
|
||||
if (freq >= target_freq)
|
||||
return pos - table;
|
||||
return idx;
|
||||
|
||||
best = pos;
|
||||
best = idx;
|
||||
}
|
||||
|
||||
return best - table;
|
||||
return best;
|
||||
}
|
||||
|
||||
/* Find lowest freq at or above target in a table in descending order */
|
||||
|
@ -687,28 +715,29 @@ static inline int cpufreq_table_find_index_dl(struct cpufreq_policy *policy,
|
|||
unsigned int target_freq)
|
||||
{
|
||||
struct cpufreq_frequency_table *table = policy->freq_table;
|
||||
struct cpufreq_frequency_table *pos, *best = table - 1;
|
||||
struct cpufreq_frequency_table *pos;
|
||||
unsigned int freq;
|
||||
int idx, best = -1;
|
||||
|
||||
cpufreq_for_each_valid_entry(pos, table) {
|
||||
cpufreq_for_each_valid_entry_idx(pos, table, idx) {
|
||||
freq = pos->frequency;
|
||||
|
||||
if (freq == target_freq)
|
||||
return pos - table;
|
||||
return idx;
|
||||
|
||||
if (freq > target_freq) {
|
||||
best = pos;
|
||||
best = idx;
|
||||
continue;
|
||||
}
|
||||
|
||||
/* No freq found above target_freq */
|
||||
if (best == table - 1)
|
||||
return pos - table;
|
||||
if (best == -1)
|
||||
return idx;
|
||||
|
||||
return best - table;
|
||||
return best;
|
||||
}
|
||||
|
||||
return best - table;
|
||||
return best;
|
||||
}
|
||||
|
||||
/* Works only on sorted freq-tables */
|
||||
|
@ -728,28 +757,29 @@ static inline int cpufreq_table_find_index_ah(struct cpufreq_policy *policy,
|
|||
unsigned int target_freq)
|
||||
{
|
||||
struct cpufreq_frequency_table *table = policy->freq_table;
|
||||
struct cpufreq_frequency_table *pos, *best = table - 1;
|
||||
struct cpufreq_frequency_table *pos;
|
||||
unsigned int freq;
|
||||
int idx, best = -1;
|
||||
|
||||
cpufreq_for_each_valid_entry(pos, table) {
|
||||
cpufreq_for_each_valid_entry_idx(pos, table, idx) {
|
||||
freq = pos->frequency;
|
||||
|
||||
if (freq == target_freq)
|
||||
return pos - table;
|
||||
return idx;
|
||||
|
||||
if (freq < target_freq) {
|
||||
best = pos;
|
||||
best = idx;
|
||||
continue;
|
||||
}
|
||||
|
||||
/* No freq found below target_freq */
|
||||
if (best == table - 1)
|
||||
return pos - table;
|
||||
if (best == -1)
|
||||
return idx;
|
||||
|
||||
return best - table;
|
||||
return best;
|
||||
}
|
||||
|
||||
return best - table;
|
||||
return best;
|
||||
}
|
||||
|
||||
/* Find highest freq at or below target in a table in descending order */
|
||||
|
@ -757,19 +787,20 @@ static inline int cpufreq_table_find_index_dh(struct cpufreq_policy *policy,
|
|||
unsigned int target_freq)
|
||||
{
|
||||
struct cpufreq_frequency_table *table = policy->freq_table;
|
||||
struct cpufreq_frequency_table *pos, *best = table - 1;
|
||||
struct cpufreq_frequency_table *pos;
|
||||
unsigned int freq;
|
||||
int idx, best = -1;
|
||||
|
||||
cpufreq_for_each_valid_entry(pos, table) {
|
||||
cpufreq_for_each_valid_entry_idx(pos, table, idx) {
|
||||
freq = pos->frequency;
|
||||
|
||||
if (freq <= target_freq)
|
||||
return pos - table;
|
||||
return idx;
|
||||
|
||||
best = pos;
|
||||
best = idx;
|
||||
}
|
||||
|
||||
return best - table;
|
||||
return best;
|
||||
}
|
||||
|
||||
/* Works only on sorted freq-tables */
|
||||
|
@ -789,32 +820,33 @@ static inline int cpufreq_table_find_index_ac(struct cpufreq_policy *policy,
|
|||
unsigned int target_freq)
|
||||
{
|
||||
struct cpufreq_frequency_table *table = policy->freq_table;
|
||||
struct cpufreq_frequency_table *pos, *best = table - 1;
|
||||
struct cpufreq_frequency_table *pos;
|
||||
unsigned int freq;
|
||||
int idx, best = -1;
|
||||
|
||||
cpufreq_for_each_valid_entry(pos, table) {
|
||||
cpufreq_for_each_valid_entry_idx(pos, table, idx) {
|
||||
freq = pos->frequency;
|
||||
|
||||
if (freq == target_freq)
|
||||
return pos - table;
|
||||
return idx;
|
||||
|
||||
if (freq < target_freq) {
|
||||
best = pos;
|
||||
best = idx;
|
||||
continue;
|
||||
}
|
||||
|
||||
/* No freq found below target_freq */
|
||||
if (best == table - 1)
|
||||
return pos - table;
|
||||
if (best == -1)
|
||||
return idx;
|
||||
|
||||
/* Choose the closest freq */
|
||||
if (target_freq - best->frequency > freq - target_freq)
|
||||
return pos - table;
|
||||
if (target_freq - table[best].frequency > freq - target_freq)
|
||||
return idx;
|
||||
|
||||
return best - table;
|
||||
return best;
|
||||
}
|
||||
|
||||
return best - table;
|
||||
return best;
|
||||
}
|
||||
|
||||
/* Find closest freq to target in a table in descending order */
|
||||
|
@ -822,32 +854,33 @@ static inline int cpufreq_table_find_index_dc(struct cpufreq_policy *policy,
|
|||
unsigned int target_freq)
|
||||
{
|
||||
struct cpufreq_frequency_table *table = policy->freq_table;
|
||||
struct cpufreq_frequency_table *pos, *best = table - 1;
|
||||
struct cpufreq_frequency_table *pos;
|
||||
unsigned int freq;
|
||||
int idx, best = -1;
|
||||
|
||||
cpufreq_for_each_valid_entry(pos, table) {
|
||||
cpufreq_for_each_valid_entry_idx(pos, table, idx) {
|
||||
freq = pos->frequency;
|
||||
|
||||
if (freq == target_freq)
|
||||
return pos - table;
|
||||
return idx;
|
||||
|
||||
if (freq > target_freq) {
|
||||
best = pos;
|
||||
best = idx;
|
||||
continue;
|
||||
}
|
||||
|
||||
/* No freq found above target_freq */
|
||||
if (best == table - 1)
|
||||
return pos - table;
|
||||
if (best == -1)
|
||||
return idx;
|
||||
|
||||
/* Choose the closest freq */
|
||||
if (best->frequency - target_freq > target_freq - freq)
|
||||
return pos - table;
|
||||
if (table[best].frequency - target_freq > target_freq - freq)
|
||||
return idx;
|
||||
|
||||
return best - table;
|
||||
return best;
|
||||
}
|
||||
|
||||
return best - table;
|
||||
return best;
|
||||
}
|
||||
|
||||
/* Works only on sorted freq-tables */
|
||||
|
|
Loading…
Reference in New Issue