diff options
author | mav <mav@FreeBSD.org> | 2008-12-16 01:24:05 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2008-12-16 01:24:05 +0000 |
commit | 325d9e1d231cb5eacf1b6084a51541e4f4b21f4f (patch) | |
tree | ad0a3e772cc2b6ecee6e90b9ac5564f7b5f81b73 /sys/kern/kern_cpu.c | |
parent | e1f9a89b0dbb799574fafc6e664d5a8ee84710b0 (diff) | |
download | FreeBSD-src-325d9e1d231cb5eacf1b6084a51541e4f4b21f4f.zip FreeBSD-src-325d9e1d231cb5eacf1b6084a51541e4f4b21f4f.tar.gz |
If possible, try to obtain max_mhz on cpufreq attach instead of first request.
On HyperThreading CPUs logical cores have same frequency, so setting it
on any core will change the other's one. In most cases first request
to the second core will be the "set" request, done after setting frequency
of the first core. In such case second CPU will obtain throttled frequency
of the first core as it's max_mhz making cpufreq broken due to different
frequency sets.
Diffstat (limited to 'sys/kern/kern_cpu.c')
-rw-r--r-- | sys/kern/kern_cpu.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/kern/kern_cpu.c b/sys/kern/kern_cpu.c index 50fff53..7b0b588 100644 --- a/sys/kern/kern_cpu.c +++ b/sys/kern/kern_cpu.c @@ -144,7 +144,9 @@ static int cpufreq_attach(device_t dev) { struct cpufreq_softc *sc; + struct pcpu *pc; device_t parent; + uint64_t rate; int numdevs; CF_DEBUG("initializing %s\n", device_get_nameunit(dev)); @@ -156,7 +158,12 @@ cpufreq_attach(device_t dev) CF_MTX_INIT(&sc->lock); sc->curr_level.total_set.freq = CPUFREQ_VAL_UNKNOWN; SLIST_INIT(&sc->saved_freq); - sc->max_mhz = CPUFREQ_VAL_UNKNOWN; + /* Try to get current CPU freq to use it as maximum later if needed */ + pc = cpu_get_pcpu(dev); + if (cpu_est_clockrate(pc->pc_cpuid, &rate) == 0) + sc->max_mhz = rate / 1000000; + else + sc->max_mhz = CPUFREQ_VAL_UNKNOWN; /* * Only initialize one set of sysctls for all CPUs. In the future, |