Module Name: src Committed By: riz Date: Thu Dec 13 23:41:57 UTC 2012
Modified Files: src/sys/arch/x86/acpi [netbsd-6]: acpi_cpu_md.c Log Message: Pull up following revision(s) (requested by jruoho in ticket #741): sys/arch/x86/acpi/acpi_cpu_md.c: revision 1.72 Disable C1E also on K8, if present. From Imre Vadasz <i...@vdsz.com> in PR install/47224. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.71.2.1 src/sys/arch/x86/acpi/acpi_cpu_md.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.71 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71.2.1 --- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71 Sat Feb 11 22:09:47 2012 +++ src/sys/arch/x86/acpi/acpi_cpu_md.c Thu Dec 13 23:41:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_md.c,v 1.71 2012/02/11 22:09:47 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_md.c,v 1.71.2.1 2012/12/13 23:41:57 riz 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.71 2012/02/11 22:09:47 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.71.2.1 2012/12/13 23:41:57 riz Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -253,6 +253,12 @@ acpicpu_md_flags(void) case 0x0f: /* + * Disable C1E if present. + */ + if (rdmsr_safe(MSR_CMPHALT, &msr) != EFAULT) + val |= ACPICPU_FLAG_C_C1E; + + /* * Evaluate support for the "FID/VID * algorithm" also used by powernow(4). */ @@ -268,6 +274,9 @@ acpicpu_md_flags(void) case 0x10: case 0x11: + /* + * Disable C1E if present. + */ if (rdmsr_safe(MSR_CMPHALT, &msr) != EFAULT) val |= ACPICPU_FLAG_C_C1E;