projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pm-extra-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[cascardo/linux.git]
/
drivers
/
cpufreq
/
cppc_cpufreq.c
diff --git
a/drivers/cpufreq/cppc_cpufreq.c
b/drivers/cpufreq/cppc_cpufreq.c
index
f7e98fc
..
4852d9e
100644
(file)
--- a/
drivers/cpufreq/cppc_cpufreq.c
+++ b/
drivers/cpufreq/cppc_cpufreq.c
@@
-39,7
+39,7
@@
* performance capabilities, desired performance level
* requested etc.
*/
* performance capabilities, desired performance level
* requested etc.
*/
-static struct cpudata **all_cpu_data;
+static struct cp
pc_cp
udata **all_cpu_data;
/* Capture the max KHz from DMI */
static u64 cppc_dmi_max_khz;
/* Capture the max KHz from DMI */
static u64 cppc_dmi_max_khz;
@@
-78,7
+78,7
@@
static int cppc_cpufreq_set_target(struct cpufreq_policy *policy,
unsigned int target_freq,
unsigned int relation)
{
unsigned int target_freq,
unsigned int relation)
{
- struct cpudata *cpu;
+ struct cp
pc_cp
udata *cpu;
struct cpufreq_freqs freqs;
u32 desired_perf;
int ret = 0;
struct cpufreq_freqs freqs;
u32 desired_perf;
int ret = 0;
@@
-114,7
+114,7
@@
static int cppc_verify_policy(struct cpufreq_policy *policy)
static void cppc_cpufreq_stop_cpu(struct cpufreq_policy *policy)
{
int cpu_num = policy->cpu;
static void cppc_cpufreq_stop_cpu(struct cpufreq_policy *policy)
{
int cpu_num = policy->cpu;
- struct cpudata *cpu = all_cpu_data[cpu_num];
+ struct cp
pc_cp
udata *cpu = all_cpu_data[cpu_num];
int ret;
cpu->perf_ctrls.desired_perf = cpu->perf_caps.lowest_perf;
int ret;
cpu->perf_ctrls.desired_perf = cpu->perf_caps.lowest_perf;
@@
-127,7
+127,7
@@
static void cppc_cpufreq_stop_cpu(struct cpufreq_policy *policy)
static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
{
static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
{
- struct cpudata *cpu;
+ struct cp
pc_cp
udata *cpu;
unsigned int cpu_num = policy->cpu;
int ret = 0;
unsigned int cpu_num = policy->cpu;
int ret = 0;
@@
-148,6
+148,7
@@
static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
policy->max = cppc_dmi_max_khz;
policy->cpuinfo.min_freq = policy->min;
policy->cpuinfo.max_freq = policy->max;
policy->max = cppc_dmi_max_khz;
policy->cpuinfo.min_freq = policy->min;
policy->cpuinfo.max_freq = policy->max;
+ policy->cpuinfo.transition_latency = cppc_get_transition_latency(cpu_num);
policy->shared_type = cpu->shared_type;
if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
policy->shared_type = cpu->shared_type;
if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
@@
-185,7
+186,7
@@
static struct cpufreq_driver cppc_cpufreq_driver = {
static int __init cppc_cpufreq_init(void)
{
int i, ret = 0;
static int __init cppc_cpufreq_init(void)
{
int i, ret = 0;
- struct cpudata *cpu;
+ struct cp
pc_cp
udata *cpu;
if (acpi_disabled)
return -ENODEV;
if (acpi_disabled)
return -ENODEV;
@@
-195,7
+196,7
@@
static int __init cppc_cpufreq_init(void)
return -ENOMEM;
for_each_possible_cpu(i) {
return -ENOMEM;
for_each_possible_cpu(i) {
- all_cpu_data[i] = kzalloc(sizeof(struct cpudata), GFP_KERNEL);
+ all_cpu_data[i] = kzalloc(sizeof(struct cp
pc_cp
udata), GFP_KERNEL);
if (!all_cpu_data[i])
goto out;
if (!all_cpu_data[i])
goto out;
@@
-226,7
+227,7
@@
out:
static void __exit cppc_cpufreq_exit(void)
{
static void __exit cppc_cpufreq_exit(void)
{
- struct cpudata *cpu;
+ struct cp
pc_cp
udata *cpu;
int i;
cpufreq_unregister_driver(&cppc_cpufreq_driver);
int i;
cpufreq_unregister_driver(&cppc_cpufreq_driver);