[src/netbsd-6]: src/sys/arch/x86/acpi Pull up following revision(s) (requeste...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e7e2a7c3a970
branches:  netbsd-6
changeset: 775569:e7e2a7c3a970
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Dec 13 23:41:57 2012 +0000

description:
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 <imre%vdsz.com@localhost>
in PR install/47224.

diffstat:

 sys/arch/x86/acpi/acpi_cpu_md.c |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r f23a9f9b6eba -r e7e2a7c3a970 sys/arch/x86/acpi/acpi_cpu_md.c
--- a/sys/arch/x86/acpi/acpi_cpu_md.c   Thu Dec 13 17:38:55 2012 +0000
+++ b/sys/arch/x86/acpi/acpi_cpu_md.c   Thu Dec 13 23:41:57 2012 +0000
@@ -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 <jruohonen%iki.fi@localhost>
@@ -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 @@
                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 @@
                case 0x10:
                case 0x11:
 
+                       /*
+                        * Disable C1E if present.
+                        */
                        if (rdmsr_safe(MSR_CMPHALT, &msr) != EFAULT)
                                val |= ACPICPU_FLAG_C_C1E;