Commit 6ea7844f authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Jeff Garzik

[PATCH] (2/5) CPUfreq i386 core

CPUFreq i386 core for 2.5.39:
arch/i386/kernel/i386_ksyms.c	export cpu_khz
arch/i386/kernel/time.c		update various i386 values on frequency
				changes
include/asm-i386/msr.h		add Transmeta MSR defines
parent e9b92d00
...@@ -50,6 +50,7 @@ extern struct drive_info_struct drive_info; ...@@ -50,6 +50,7 @@ extern struct drive_info_struct drive_info;
EXPORT_SYMBOL(drive_info); EXPORT_SYMBOL(drive_info);
#endif #endif
extern unsigned long cpu_khz;
extern unsigned long get_cmos_time(void); extern unsigned long get_cmos_time(void);
/* platform dependent support */ /* platform dependent support */
...@@ -80,6 +81,7 @@ EXPORT_SYMBOL(kernel_thread); ...@@ -80,6 +81,7 @@ EXPORT_SYMBOL(kernel_thread);
EXPORT_SYMBOL(pm_idle); EXPORT_SYMBOL(pm_idle);
EXPORT_SYMBOL(pm_power_off); EXPORT_SYMBOL(pm_power_off);
EXPORT_SYMBOL(get_cmos_time); EXPORT_SYMBOL(get_cmos_time);
EXPORT_SYMBOL(cpu_khz);
EXPORT_SYMBOL(apm_info); EXPORT_SYMBOL(apm_info);
#ifdef CONFIG_DEBUG_IOVIRT #ifdef CONFIG_DEBUG_IOVIRT
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/cpufreq.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/smp.h> #include <asm/smp.h>
...@@ -603,6 +604,52 @@ static int time_init_device(void) ...@@ -603,6 +604,52 @@ static int time_init_device(void)
device_initcall(time_init_device); device_initcall(time_init_device);
#ifdef CONFIG_CPU_FREQ
static int
time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
void *data)
{
struct cpufreq_freqs *freq = data;
unsigned int i;
if (!cpu_has_tsc)
return 0;
switch (val) {
case CPUFREQ_PRECHANGE:
if ((freq->old < freq->new) &&
((freq->cpu == CPUFREQ_ALL_CPUS) || (freq->cpu == 0))) {
cpu_khz = cpufreq_scale(cpu_khz, freq->old, freq->new);
fast_gettimeoffset_quotient = cpufreq_scale(fast_gettimeoffset_quotient, freq->new, freq->old);
}
for (i=0; i<NR_CPUS; i++)
if ((freq->cpu == CPUFREQ_ALL_CPUS) || (freq->cpu == i))
cpu_data[i].loops_per_jiffy = cpufreq_scale(loops_per_jiffy, freq->old, freq->new);
break;
case CPUFREQ_POSTCHANGE:
if ((freq->new < freq->old) &&
((freq->cpu == CPUFREQ_ALL_CPUS) || (freq->cpu == 0))) {
cpu_khz = cpufreq_scale(cpu_khz, freq->old, freq->new);
fast_gettimeoffset_quotient = cpufreq_scale(fast_gettimeoffset_quotient, freq->new, freq->old);
}
for (i=0; i<NR_CPUS; i++)
if ((freq->cpu == CPUFREQ_ALL_CPUS) || (freq->cpu == i))
cpu_data[i].loops_per_jiffy = cpufreq_scale(loops_per_jiffy, freq->old, freq->new);
break;
}
return 0;
}
static struct notifier_block time_cpufreq_notifier_block = {
notifier_call: time_cpufreq_notifier
};
#endif
void __init time_init(void) void __init time_init(void)
{ {
#ifdef CONFIG_X86_TSC #ifdef CONFIG_X86_TSC
...@@ -665,6 +712,9 @@ void __init time_init(void) ...@@ -665,6 +712,9 @@ void __init time_init(void)
"0" (eax), "1" (edx)); "0" (eax), "1" (edx));
printk("Detected %lu.%03lu MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000); printk("Detected %lu.%03lu MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000);
} }
#ifdef CONFIG_CPU_FREQ
cpufreq_register_notifier(&time_cpufreq_notifier_block, CPUFREQ_TRANSITION_NOTIFIER);
#endif
} }
} }
#endif /* CONFIG_X86_TSC */ #endif /* CONFIG_X86_TSC */
......
...@@ -125,4 +125,10 @@ ...@@ -125,4 +125,10 @@
#define MSR_VIA_LONGHAUL 0x110a #define MSR_VIA_LONGHAUL 0x110a
#define MSR_VIA_BCR2 0x1147 #define MSR_VIA_BCR2 0x1147
/* Transmeta defined MSRs */
#define MSR_TMTA_LONGRUN_CTRL 0x80868010
#define MSR_TMTA_LONGRUN_FLAGS 0x80868011
#define MSR_TMTA_LRTI_READOUT 0x80868018
#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a
#endif /* __ASM_MSR_H */ #endif /* __ASM_MSR_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment