git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
cpu
/
cpufreq
/
longrun.c
diff --git
a/arch/i386/kernel/cpu/cpufreq/longrun.c
b/arch/i386/kernel/cpu/cpufreq/longrun.c
index
e51bb03
..
e3868de
100644
(file)
--- a/
arch/i386/kernel/cpu/cpufreq/longrun.c
+++ b/
arch/i386/kernel/cpu/cpufreq/longrun.c
@@
-7,7
+7,7
@@
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/cpufreq.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/cpufreq.h>
@@
-16,10
+16,12
@@
#include <asm/processor.h>
#include <asm/timex.h>
#include <asm/processor.h>
#include <asm/timex.h>
+#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "longrun", msg)
+
static struct cpufreq_driver longrun_driver;
/**
static struct cpufreq_driver longrun_driver;
/**
- * longrun_{low,high}_freq is needed for the conversion of cpufreq kHz
+ * longrun_{low,high}_freq is needed for the conversion of cpufreq kHz
* values into per cent values. In TMTA microcode, the following is valid:
* performance_pctg = (current_freq - low_freq)/(high_freq - low_freq)
*/
* values into per cent values. In TMTA microcode, the following is valid:
* performance_pctg = (current_freq - low_freq)/(high_freq - low_freq)
*/
@@
-38,19
+40,26
@@
static void __init longrun_get_policy(struct cpufreq_policy *policy)
u32 msr_lo, msr_hi;
rdmsr(MSR_TMTA_LONGRUN_FLAGS, msr_lo, msr_hi);
u32 msr_lo, msr_hi;
rdmsr(MSR_TMTA_LONGRUN_FLAGS, msr_lo, msr_hi);
+ dprintk("longrun flags are %x - %x\n", msr_lo, msr_hi);
if (msr_lo & 0x01)
policy->policy = CPUFREQ_POLICY_PERFORMANCE;
else
policy->policy = CPUFREQ_POLICY_POWERSAVE;
if (msr_lo & 0x01)
policy->policy = CPUFREQ_POLICY_PERFORMANCE;
else
policy->policy = CPUFREQ_POLICY_POWERSAVE;
-
+
rdmsr(MSR_TMTA_LONGRUN_CTRL, msr_lo, msr_hi);
rdmsr(MSR_TMTA_LONGRUN_CTRL, msr_lo, msr_hi);
+ dprintk("longrun ctrl is %x - %x\n", msr_lo, msr_hi);
msr_lo &= 0x0000007F;
msr_hi &= 0x0000007F;
msr_lo &= 0x0000007F;
msr_hi &= 0x0000007F;
- policy->min = longrun_low_freq + msr_lo *
- ((longrun_high_freq - longrun_low_freq) / 100);
- policy->max = longrun_low_freq + msr_hi *
- ((longrun_high_freq - longrun_low_freq) / 100);
+ if ( longrun_high_freq <= longrun_low_freq ) {
+ /* Assume degenerate Longrun table */
+ policy->min = policy->max = longrun_high_freq;
+ } else {
+ policy->min = longrun_low_freq + msr_lo *
+ ((longrun_high_freq - longrun_low_freq) / 100);
+ policy->max = longrun_low_freq + msr_hi *
+ ((longrun_high_freq - longrun_low_freq) / 100);
+ }
policy->cpu = 0;
}
policy->cpu = 0;
}
@@
-70,10
+79,15
@@
static int longrun_set_policy(struct cpufreq_policy *policy)
if (!policy)
return -EINVAL;
if (!policy)
return -EINVAL;
- pctg_lo = (policy->min - longrun_low_freq) /
- ((longrun_high_freq - longrun_low_freq) / 100);
- pctg_hi = (policy->max - longrun_low_freq) /
- ((longrun_high_freq - longrun_low_freq) / 100);
+ if ( longrun_high_freq <= longrun_low_freq ) {
+ /* Assume degenerate Longrun table */
+ pctg_lo = pctg_hi = 100;
+ } else {
+ pctg_lo = (policy->min - longrun_low_freq) /
+ ((longrun_high_freq - longrun_low_freq) / 100);
+ pctg_hi = (policy->max - longrun_low_freq) /
+ ((longrun_high_freq - longrun_low_freq) / 100);
+ }
if (pctg_hi > 100)
pctg_hi = 100;
if (pctg_hi > 100)
pctg_hi = 100;
@@
-108,7
+122,7
@@
static int longrun_set_policy(struct cpufreq_policy *policy)
* longrun_verify_poliy - verifies a new CPUFreq policy
* @policy: the policy to verify
*
* longrun_verify_poliy - verifies a new CPUFreq policy
* @policy: the policy to verify
*
- * Validates a new CPUFreq policy. This function has to be called with
+ * Validates a new CPUFreq policy. This function has to be called with
* cpufreq_driver locked.
*/
static int longrun_verify_policy(struct cpufreq_policy *policy)
* cpufreq_driver locked.
*/
static int longrun_verify_policy(struct cpufreq_policy *policy)
@@
-117,8
+131,8
@@
static int longrun_verify_policy(struct cpufreq_policy *policy)
return -EINVAL;
policy->cpu = 0;
return -EINVAL;
policy->cpu = 0;
- cpufreq_verify_within_limits(policy,
- policy->cpuinfo.min_freq,
+ cpufreq_verify_within_limits(policy,
+ policy->cpuinfo.min_freq,
policy->cpuinfo.max_freq);
if ((policy->policy != CPUFREQ_POLICY_POWERSAVE) &&
policy->cpuinfo.max_freq);
if ((policy->policy != CPUFREQ_POLICY_POWERSAVE) &&
@@
-128,6
+142,18
@@
static int longrun_verify_policy(struct cpufreq_policy *policy)
return 0;
}
return 0;
}
+static unsigned int longrun_get(unsigned int cpu)
+{
+ u32 eax, ebx, ecx, edx;
+
+ if (cpu)
+ return 0;
+
+ cpuid(0x80860007, &eax, &ebx, &ecx, &edx);
+ dprintk("cpuid eax is %u\n", eax);
+
+ return (eax * 1000);
+}
/**
* longrun_determine_freqs - determines the lowest and highest possible core frequency
/**
* longrun_determine_freqs - determines the lowest and highest possible core frequency
@@
-139,7
+165,7
@@
static int longrun_verify_policy(struct cpufreq_policy *policy)
* TMTA rules:
* performance_pctg = (target_freq - low_freq)/(high_freq - low_freq)
*/
* TMTA rules:
* performance_pctg = (target_freq - low_freq)/(high_freq - low_freq)
*/
-static unsigned int __init longrun_determine_freqs(unsigned int *low_freq,
+static unsigned int __init longrun_determine_freqs(unsigned int *low_freq,
unsigned int *high_freq)
{
u32 msr_lo, msr_hi;
unsigned int *high_freq)
{
u32 msr_lo, msr_hi;
@@
-153,9
+179,9
@@
static unsigned int __init longrun_determine_freqs(unsigned int *low_freq,
if (cpu_has(c, X86_FEATURE_LRTI)) {
/* if the LongRun Table Interface is present, the
if (cpu_has(c, X86_FEATURE_LRTI)) {
/* if the LongRun Table Interface is present, the
- * detection is a bit easier:
+ * detection is a bit easier:
* For minimum frequency, read out the maximum
* For minimum frequency, read out the maximum
- * level (msr_hi), write that into "currently
+ * level (msr_hi), write that into "currently
* selected level", and read out the frequency.
* For maximum frequency, read out level zero.
*/
* selected level", and read out the frequency.
* For maximum frequency, read out level zero.
*/
@@
-170,6
+196,8
@@
static unsigned int __init longrun_determine_freqs(unsigned int *low_freq,
rdmsr(MSR_TMTA_LRTI_VOLT_MHZ, msr_lo, msr_hi);
*high_freq = msr_lo * 1000; /* to kHz */
rdmsr(MSR_TMTA_LRTI_VOLT_MHZ, msr_lo, msr_hi);
*high_freq = msr_lo * 1000; /* to kHz */
+ dprintk("longrun table interface told %u - %u kHz\n", *low_freq, *high_freq);
+
if (*low_freq > *high_freq)
*low_freq = *high_freq;
return 0;
if (*low_freq > *high_freq)
*low_freq = *high_freq;
return 0;
@@
-178,6
+206,7
@@
static unsigned int __init longrun_determine_freqs(unsigned int *low_freq,
/* set the upper border to the value determined during TSC init */
*high_freq = (cpu_khz / 1000);
*high_freq = *high_freq * 1000;
/* set the upper border to the value determined during TSC init */
*high_freq = (cpu_khz / 1000);
*high_freq = *high_freq * 1000;
+ dprintk("high frequency is %u kHz\n", *high_freq);
/* get current borders */
rdmsr(MSR_TMTA_LONGRUN_CTRL, msr_lo, msr_hi);
/* get current borders */
rdmsr(MSR_TMTA_LONGRUN_CTRL, msr_lo, msr_hi);
@@
-202,8
+231,9
@@
static unsigned int __init longrun_determine_freqs(unsigned int *low_freq,
cpuid(0x80860007, &eax, &ebx, &ecx, &edx);
/* restore values */
cpuid(0x80860007, &eax, &ebx, &ecx, &edx);
/* restore values */
- wrmsr(MSR_TMTA_LONGRUN_CTRL, save_lo, save_hi);
+ wrmsr(MSR_TMTA_LONGRUN_CTRL, save_lo, save_hi);
}
}
+ dprintk("percentage is %u %%, freq is %u MHz\n", ecx, eax);
/* performance_pctg = (current_freq - low_freq)/(high_freq - low_freq)
* eqals
/* performance_pctg = (current_freq - low_freq)/(high_freq - low_freq)
* eqals
@@
-216,9
+246,11
@@
static unsigned int __init longrun_determine_freqs(unsigned int *low_freq,
if ((ecx > 95) || (ecx == 0) || (eax < ebx))
return -EIO;
if ((ecx > 95) || (ecx == 0) || (eax < ebx))
return -EIO;
- edx = (eax - ebx) / (100 - ecx);
+ edx = (eax - ebx) / (100 - ecx);
*low_freq = edx * 1000; /* back to kHz */
*low_freq = edx * 1000; /* back to kHz */
+ dprintk("low frequency is %u kHz\n", *low_freq);
+
if (*low_freq > *high_freq)
*low_freq = *high_freq;
if (*low_freq > *high_freq)
*low_freq = *high_freq;
@@
-228,7
+260,7
@@
static unsigned int __init longrun_determine_freqs(unsigned int *low_freq,
static int __init longrun_cpu_init(struct cpufreq_policy *policy)
{
static int __init longrun_cpu_init(struct cpufreq_policy *policy)
{
- int
result = 0;
+ int result = 0;
/* capability check */
if (policy->cpu != 0)
/* capability check */
if (policy->cpu != 0)
@@
-244,14
+276,16
@@
static int __init longrun_cpu_init(struct cpufreq_policy *policy)
policy->cpuinfo.max_freq = longrun_high_freq;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
longrun_get_policy(policy);
policy->cpuinfo.max_freq = longrun_high_freq;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
longrun_get_policy(policy);
-
+
return 0;
}
static struct cpufreq_driver longrun_driver = {
return 0;
}
static struct cpufreq_driver longrun_driver = {
- .verify = longrun_verify_policy,
- .setpolicy = longrun_set_policy,
+ .flags = CPUFREQ_CONST_LOOPS,
+ .verify = longrun_verify_policy,
+ .setpolicy = longrun_set_policy,
+ .get = longrun_get,
.init = longrun_cpu_init,
.name = "longrun",
.owner = THIS_MODULE,
.init = longrun_cpu_init,
.name = "longrun",
.owner = THIS_MODULE,
@@
-267,7
+301,7
@@
static int __init longrun_init(void)
{
struct cpuinfo_x86 *c = cpu_data;
{
struct cpuinfo_x86 *c = cpu_data;
- if (c->x86_vendor != X86_VENDOR_TRANSMETA ||
+ if (c->x86_vendor != X86_VENDOR_TRANSMETA ||
!cpu_has(c, X86_FEATURE_LONGRUN))
return -ENODEV;
!cpu_has(c, X86_FEATURE_LONGRUN))
return -ENODEV;
@@
-285,7
+319,7
@@
static void __exit longrun_exit(void)
MODULE_AUTHOR ("Dominik Brodowski <linux@brodo.de>");
MODULE_AUTHOR ("Dominik Brodowski <linux@brodo.de>");
-MODULE_DESCRIPTION ("LongRun driver for Transmeta Crusoe processors.");
+MODULE_DESCRIPTION ("LongRun driver for Transmeta Crusoe
and Efficeon
processors.");
MODULE_LICENSE ("GPL");
module_init(longrun_init);
MODULE_LICENSE ("GPL");
module_init(longrun_init);