From aab8b1b55f35c81e3417c8a7d6c53d0fc0bbbbab Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Mon, 7 Feb 2005 11:35:24 +0000 Subject: [PATCH] Fix the problem with incorrect throttling level reported immediately after reboot. Safter the reboot the TCC is usually in the Automatic mode, in which reading current performance level is likely to produce bogus results make sure to switch it to the On-Demand mode and set to some known performance level. Unfortunately there is no reliable way to check that TCC is in the Automatic mode. Reading bit 4 of ACPI Thermal Monitor Control Register produces 0 regardless of the current mode. MFC after: 1 week --- sys/i386/cpufreq/p4tcc.c | 11 +++++++++++ sys/i386/i386/p4tcc.c | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/sys/i386/cpufreq/p4tcc.c b/sys/i386/cpufreq/p4tcc.c index f65e5d1eb677..e3e0a030fe88 100644 --- a/sys/i386/cpufreq/p4tcc.c +++ b/sys/i386/cpufreq/p4tcc.c @@ -223,6 +223,17 @@ setup_p4tcc(void *dummy __unused) p4tcc_economy = tcc[TCC_LEVELS - 1].rlevel; p4tcc_performance = tcc[0].rlevel; + /* + * Since after the reboot the TCC is usually in the Automatic + * mode, in which reading current performance level is likely to + * produce bogus results make sure to switch it to the On-Demand + * mode and set to some known performance level. Unfortunately + * there is no reliable way to check that TCC is in the Automatic + * mode, reading bit 4 of ACPI Thermal Monitor Control Register + * produces 0 regardless of the current mode. + */ + p4tcc_setperf(p4tcc_performance); + p4tcc_percentage = p4tcc_getperf(); printf("Pentium 4 TCC support enabled, %d steps from 100%% to %d%%, " "current performance %u%%\n", nsteps, p4tcc_economy, diff --git a/sys/i386/i386/p4tcc.c b/sys/i386/i386/p4tcc.c index f65e5d1eb677..e3e0a030fe88 100644 --- a/sys/i386/i386/p4tcc.c +++ b/sys/i386/i386/p4tcc.c @@ -223,6 +223,17 @@ setup_p4tcc(void *dummy __unused) p4tcc_economy = tcc[TCC_LEVELS - 1].rlevel; p4tcc_performance = tcc[0].rlevel; + /* + * Since after the reboot the TCC is usually in the Automatic + * mode, in which reading current performance level is likely to + * produce bogus results make sure to switch it to the On-Demand + * mode and set to some known performance level. Unfortunately + * there is no reliable way to check that TCC is in the Automatic + * mode, reading bit 4 of ACPI Thermal Monitor Control Register + * produces 0 regardless of the current mode. + */ + p4tcc_setperf(p4tcc_performance); + p4tcc_percentage = p4tcc_getperf(); printf("Pentium 4 TCC support enabled, %d steps from 100%% to %d%%, " "current performance %u%%\n", nsteps, p4tcc_economy,