Messages in this thread Patch in this message | | | Date | Tue, 17 Sep 2002 11:32:50 +0200 | From | Dominik Brodowski <> | Subject | [PATCH][2.5.35] CPUfreq i386 core (2/5) |
| |
CPUFreq i386 core for 2.5.35: 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
diff -ruN linux-2535original/arch/i386/kernel/i386_ksyms.c linux/arch/i386/kernel/i386_ksyms.c --- linux-2535original/arch/i386/kernel/i386_ksyms.c Tue Sep 17 09:22:43 2002 +++ linux/arch/i386/kernel/i386_ksyms.c Tue Sep 17 09:30:59 2002 @@ -50,6 +50,7 @@ EXPORT_SYMBOL(drive_info); #endif +extern unsigned long cpu_khz; extern unsigned long get_cmos_time(void); /* platform dependent support */ @@ -76,6 +77,7 @@ EXPORT_SYMBOL(pm_idle); EXPORT_SYMBOL(pm_power_off); EXPORT_SYMBOL(get_cmos_time); +EXPORT_SYMBOL(cpu_khz); EXPORT_SYMBOL(apm_info); #ifdef CONFIG_DEBUG_IOVIRT diff -ruN linux-2535original/arch/i386/kernel/time.c linux/arch/i386/kernel/time.c --- linux-2535original/arch/i386/kernel/time.c Tue Sep 17 09:24:52 2002 +++ linux/arch/i386/kernel/time.c Tue Sep 17 09:30:59 2002 @@ -43,6 +43,7 @@ #include <linux/smp.h> #include <linux/module.h> #include <linux/device.h> +#include <linux/cpufreq.h> #include <asm/io.h> #include <asm/smp.h> @@ -651,6 +652,52 @@ __initcall(time_init_driverfs); + +#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) { extern int x86_udelay_tsc; @@ -710,6 +757,9 @@ "0" (eax), "1" (edx)); 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 } } diff -ruN linux-2535original/include/asm-i386/msr.h linux/include/asm-i386/msr.h --- linux-2535original/include/asm-i386/msr.h Tue Sep 17 09:23:54 2002 +++ linux/include/asm-i386/msr.h Tue Sep 17 09:30:59 2002 @@ -125,4 +125,8 @@ #define MSR_VIA_LONGHAUL 0x110a #define MSR_VIA_BCR2 0x1147 +/* Transmeta defined MSRs */ +#define MSR_TMTA_LONGRUN_CTRL 0x80868010 +#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 + #endif /* __ASM_MSR_H */ [unhandled content-type:application/pgp-signature] | |