Module Name: src
Committed By: jruoho
Date: Wed Mar 2 06:17:09 UTC 2011
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
src/sys/dev/acpi: acpi_cpu.c
Log Message:
Append Intel's Turbo Boost to the debug printfs if we detect it.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/x86/acpi/acpi_cpu_md.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/acpi/acpi_cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.50 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.51
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.50 Tue Mar 1 05:02:16 2011
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Wed Mar 2 06:17:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.50 2011/03/01 05:02:16 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.51 2011/03/02 06:17:09 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.50 2011/03/01 05:02:16 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.51 2011/03/02 06:17:09 jruoho Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -533,6 +533,7 @@
/*
* If the so-called Turbo Boost is present,
* the P0-state is always the "turbo state".
+ * It is shown as the P1 frequency + 1 MHz.
*
* For discussion, see:
*
@@ -540,8 +541,13 @@
* in Intel Core(tm) Microarchitectures (Nehalem)
* Based Processors. White Paper, November 2008.
*/
- if ((sc->sc_flags & ACPICPU_FLAG_P_TURBO) != 0)
- sc->sc_pstate[0].ps_flags |= ACPICPU_FLAG_P_TURBO;
+ if ((sc->sc_flags & ACPICPU_FLAG_P_TURBO) != 0) {
+
+ ps = &sc->sc_pstate[0];
+
+ if (ps->ps_freq == sc->sc_pstate[1].ps_freq + 1)
+ ps->ps_flags |= ACPICPU_FLAG_P_TURBO;
+ }
msr.ps_control_addr = MSR_PERF_CTL;
msr.ps_control_mask = __BITS(0, 15);
Index: src/sys/dev/acpi/acpi_cpu.c
diff -u src/sys/dev/acpi/acpi_cpu.c:1.34 src/sys/dev/acpi/acpi_cpu.c:1.35
--- src/sys/dev/acpi/acpi_cpu.c:1.34 Tue Mar 1 13:38:45 2011
+++ src/sys/dev/acpi/acpi_cpu.c Wed Mar 2 06:17:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.c,v 1.34 2011/03/01 13:38:45 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.c,v 1.35 2011/03/02 06:17:08 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.34 2011/03/01 13:38:45 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.35 2011/03/02 06:17:08 jruoho Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -800,10 +800,10 @@
continue;
aprint_verbose_dev(sc->sc_dev, "C%d: %3s, "
- "lat %3u us, pow %5u mW, %s\n", i,
+ "lat %3u us, pow %5u mW%s\n", i,
acpicpu_debug_print_method(cs->cs_method),
cs->cs_latency, cs->cs_power,
- (cs->cs_flags != 0) ? "bus master check" : "");
+ (cs->cs_flags != 0) ? ", bus master check" : "");
}
method = sc->sc_pstate_control.reg_spaceid;
@@ -816,9 +816,11 @@
continue;
aprint_verbose_dev(sc->sc_dev, "P%d: %3s, "
- "lat %3u us, pow %5u mW, %4u MHz\n", i,
+ "lat %3u us, pow %5u mW, %4u MHz%s\n", i,
acpicpu_debug_print_method(method),
- ps->ps_latency, ps->ps_power, ps->ps_freq);
+ ps->ps_latency, ps->ps_power, ps->ps_freq,
+ (ps->ps_flags & ACPICPU_FLAG_P_TURBO) != 0 ?
+ ", turbo boost" : "");
}
method = sc->sc_tstate_control.reg_spaceid;
