From 4a9c4056dcaceba10be1ef5c22ab0507ad344c45 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Tue, 7 Dec 2010 22:23:26 +0000 Subject: [PATCH] Now the P-state invariant TSC is probed early enough, do not register event handlers for CPU freqency changes when it is found P-state invariant. Adjust a comment about non-existent tsc_freq_max() while I am here. --- sys/amd64/amd64/tsc.c | 18 ++++++++---------- sys/i386/i386/tsc.c | 18 ++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index 86c5390045e5..ea05bb4e8c0e 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -118,13 +118,15 @@ init_TSC(void) } /* - * Inform CPU accounting about our boot-time clock rate. Once the - * system is finished booting, we will get the real max clock rate - * via tsc_freq_max(). This also will be updated if someone loads - * a cpufreq driver after boot that discovers a new max frequency. + * Inform CPU accounting about our boot-time clock rate. This will + * be updated if someone loads a cpufreq driver after boot that + * discovers a new max frequency. */ set_cputicker(rdtsc, tsc_freq, 1); + if (tsc_is_invariant) + return; + /* Register to find out about changes in CPU frequency. */ tsc_pre_tag = EVENTHANDLER_REGISTER(cpufreq_pre_change, tsc_freq_changing, NULL, EVENTHANDLER_PRI_FIRST); @@ -169,9 +171,6 @@ tsc_levels_changed(void *arg, int unit) int count, error; uint64_t max_freq; - if (tsc_is_invariant) - return; - /* Only use values from the first CPU, assuming all are equal. */ if (unit != 0) return; @@ -205,8 +204,7 @@ static void tsc_freq_changing(void *arg, const struct cf_level *level, int *status) { - if (*status != 0 || timecounter != &tsc_timecounter || - tsc_is_invariant) + if (*status != 0 || timecounter != &tsc_timecounter) return; printf("timecounter TSC must not be in use when " @@ -222,7 +220,7 @@ tsc_freq_changed(void *arg, const struct cf_level *level, int status) * If there was an error during the transition or * TSC is P-state invariant, don't do anything. */ - if (status != 0 || tsc_is_invariant) + if (status != 0) return; /* Total setting for this level gives the new frequency in MHz. */ diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index 61dabd37b54a..2b8d8a32b274 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -127,13 +127,15 @@ init_TSC(void) } /* - * Inform CPU accounting about our boot-time clock rate. Once the - * system is finished booting, we will get the real max clock rate - * via tsc_freq_max(). This also will be updated if someone loads - * a cpufreq driver after boot that discovers a new max frequency. + * Inform CPU accounting about our boot-time clock rate. This will + * be updated if someone loads a cpufreq driver after boot that + * discovers a new max frequency. */ set_cputicker(rdtsc, tsc_freq, 1); + if (tsc_is_invariant) + return; + /* Register to find out about changes in CPU frequency. */ tsc_pre_tag = EVENTHANDLER_REGISTER(cpufreq_pre_change, tsc_freq_changing, NULL, EVENTHANDLER_PRI_FIRST); @@ -197,9 +199,6 @@ tsc_levels_changed(void *arg, int unit) int count, error; uint64_t max_freq; - if (tsc_is_invariant) - return; - /* Only use values from the first CPU, assuming all are equal. */ if (unit != 0) return; @@ -233,8 +232,7 @@ static void tsc_freq_changing(void *arg, const struct cf_level *level, int *status) { - if (*status != 0 || timecounter != &tsc_timecounter || - tsc_is_invariant) + if (*status != 0 || timecounter != &tsc_timecounter) return; printf("timecounter TSC must not be in use when " @@ -250,7 +248,7 @@ tsc_freq_changed(void *arg, const struct cf_level *level, int status) * If there was an error during the transition or * TSC is P-state invariant, don't do anything. */ - if (status != 0 || tsc_is_invariant) + if (status != 0) return; /* Total setting for this level gives the new frequency in MHz. */