Skip to content

Commit

Permalink
[CPUFREQ] move policy's governor initialisation out of low-level driv…
Browse files Browse the repository at this point in the history 
…ers into cpufreq core

Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Bryan Wu <bryan.wu@analog.com>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Jones <davej@redhat.com>
  • Loading branch information
Thomas Renninger authored and Dave Jones committed Oct 4, 2007
1 parent a09d60a commit 8122c6c
Show file tree
Hide file tree
Showing 26 changed files with 2 additions and 30 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-imx/cpufreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@ static int __init imx_cpufreq_driver_init(struct cpufreq_policy *policy)
return -EINVAL;

policy->cur = policy->min = policy->max = imx_get_speed(0);
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.min_freq = 8000;
policy->cpuinfo.max_freq = 200000;
/* Manual states, that PLL stabilizes in two CLK32 periods */
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-sa1100/cpu-sa1110.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy)
if (policy->cpu != 0)
return -EINVAL;
policy->cur = policy->min = policy->max = sa11x0_getspeed(0);
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.min_freq = 59000;
policy->cpuinfo.max_freq = 287000;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
Expand Down
1 change: 0 additions & 1 deletion arch/arm/plat-omap/cpu-omap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ static int __init omap_cpu_init(struct cpufreq_policy *policy)
if (policy->cpu != 0)
return -EINVAL;
policy->cur = policy->min = policy->max = omap_getspeed(0);
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000;
policy->cpuinfo.max_freq = clk_round_rate(mpu_clk, VERY_HI_RATE) / 1000;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
Expand Down
2 changes: 0 additions & 2 deletions arch/blackfin/mach-bf533/cpu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ static int __init __bf533_cpu_init(struct cpufreq_policy *policy)
if (policy->cpu != 0)
return -EINVAL;

policy->governor = CPUFREQ_DEFAULT_GOVERNOR;

policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
/*Now ,only support one cpu */
policy->cur = bf533_getfreq(0);
Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,6 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
policy->cpuinfo.transition_latency =
perf->states[i].transition_latency * 1000;
}
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;

data->max_freq = perf->states[0].core_frequency * 1000;
/* table init */
Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy)
policy->cur = nforce2_get(policy->cpu);
policy->min = policy->cpuinfo.min_freq;
policy->max = policy->cpuinfo.max_freq;
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;

return 0;
}
Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/e_powersaver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
f_table[k].frequency = CPUFREQ_TABLE_END;
}

policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = 140000; /* 844mV -> 700mV in ns */
policy->cur = fsb * current_multiplier;

Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/elanfreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy)
}

/* cpuinfo and default policy values */
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
policy->cur = elanfreq_get_cpu_frequency(0);

Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,6 @@ static int cpufreq_gx_cpu_init(struct cpufreq_policy *policy)
policy->min = maxfreq / POLICY_MIN_DIV;
policy->max = maxfreq;
policy->cur = curfreq;
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.min_freq = maxfreq / max_duration;
policy->cpuinfo.max_freq = maxfreq;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/longhaul.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,6 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy)
if ((longhaul_version != TYPE_LONGHAUL_V1) && (scale_voltage != 0))
longhaul_setup_voltagescaling();

policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = 200000; /* nsec */
policy->cur = calc_speed(longhaul_get_cpu_mult());

Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy)
cpufreq_frequency_table_get_attr(p4clockmod_table, policy->cpu);

/* cpuinfo and default policy values */
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = 1000000; /* assumed */
policy->cur = stock_freq;

Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/powernow-k6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
}

/* cpuinfo and default policy values */
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
policy->cur = busfreq * max_multiplier;

Expand Down
2 changes: 0 additions & 2 deletions arch/i386/kernel/cpu/cpufreq/powernow-k7.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,8 +637,6 @@ static int __init powernow_cpu_init (struct cpufreq_policy *policy)
printk (KERN_INFO PFX "Minimum speed %d MHz. Maximum speed %d MHz.\n",
minimum_speed/1000, maximum_speed/1000);

policy->governor = CPUFREQ_DEFAULT_GOVERNOR;

policy->cpuinfo.transition_latency = cpufreq_scale(2000000UL, fsb, latency);

policy->cur = powernow_get(0);
Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/powernow-k8.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,6 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
/* run on any CPU again */
set_cpus_allowed(current, oldmask);

pol->governor = CPUFREQ_DEFAULT_GOVERNOR;
if (cpu_family == CPU_HW_PSTATE)
pol->cpus = cpumask_of_cpu(pol->cpu);
else
Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/sc520_freq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ static int sc520_freq_cpu_init(struct cpufreq_policy *policy)
return -ENODEV;

/* cpuinfo and default policy values */
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = 1000000; /* 1ms */
policy->cur = sc520_freq_get_cpu_frequency(0);

Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,6 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)

freq = get_cur_freq(policy->cpu);

policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = 10000; /* 10uS transition latency */
policy->cur = freq;

Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,6 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)
(speed / 1000));

/* cpuinfo and default policy values */
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cur = speed;

result = cpufreq_frequency_table_cpuinfo(policy, speedstep_freqs);
Expand Down
1 change: 0 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)
(speed / 1000));

/* cpuinfo and default policy values */
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
policy->cur = speed;

Expand Down
2 changes: 0 additions & 2 deletions arch/ia64/kernel/cpufreq/acpi-cpufreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,6 @@ acpi_cpufreq_cpu_init (
data->acpi_data.states[i].transition_latency * 1000;
}
}
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;

policy->cur = processor_get_freq(data, policy->cpu);

/* table init */
Expand Down
2 changes: 0 additions & 2 deletions arch/powerpc/platforms/cell/cbe_cpufreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
pr_debug("%d: %d\n", i, cbe_freqs[i].frequency);
}

policy->governor = CPUFREQ_DEFAULT_GOVERNOR;

/* if DEBUG is enabled set_pmode() measures the latency
* of a transition */
policy->cpuinfo.transition_latency = 25000;
Expand Down
2 changes: 0 additions & 2 deletions arch/powerpc/platforms/pasemi/cpufreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,6 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
pr_debug("%d: %d\n", i, pas_freqs[i].frequency);
}

policy->governor = CPUFREQ_DEFAULT_GOVERNOR;

policy->cpuinfo.transition_latency = get_gizmo_latency();

cur_astate = get_cur_astate(policy->cpu);
Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/platforms/powermac/cpufreq_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,6 @@ static int pmac_cpufreq_cpu_init(struct cpufreq_policy *policy)
if (policy->cpu != 0)
return -ENODEV;

policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
policy->cur = cur_freq;

Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/platforms/powermac/cpufreq_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,6 @@ static unsigned int g5_cpufreq_get_speed(unsigned int cpu)

static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy)
{
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
policy->cur = g5_cpu_freqs[g5_query_freq()].frequency;
/* secondary CPUs are tied to the primary one by the
Expand Down
1 change: 0 additions & 1 deletion arch/sh/kernel/cpufreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)
policy->cpuinfo.max_freq = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cur = sh_cpufreq_get(policy->cpu);
policy->min = policy->cpuinfo.min_freq;
policy->max = policy->cpuinfo.max_freq;
Expand Down
1 change: 0 additions & 1 deletion arch/sparc64/kernel/us2e_cpufreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,6 @@ static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy)
table[2].index = 5;
table[3].frequency = CPUFREQ_TABLE_END;

policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = 0;
policy->cur = clock_tick;

Expand Down
2 changes: 2 additions & 0 deletions drivers/cpufreq/cpufreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,8 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
init_completion(&policy->kobj_unregister);
INIT_WORK(&policy->update, handle_update);

/* Set governor before ->init, so that driver could check it */
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
/* call driver. From then on the cpufreq must be able
* to accept all calls to ->verify and ->setpolicy for this CPU
*/
Expand Down

0 comments on commit 8122c6c

Please sign in to comment.