CVS commit: src/sys/arch/x86/acpi

[Jukka Ruohonen]

Module Name:    src
Committed By:   jruoho
Date:           Thu Jun 23 08:10:36 UTC 2011

Modified Files:
        src/sys/arch/x86/acpi: acpi_cpu_md.c

Log Message:
Fix bug pointed out by njoly@.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 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.62 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.63
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.62	Wed Jun 22 08:49:54 2011
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c	Thu Jun 23 08:10:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.62 2011/06/22 08:49:54 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.63 2011/06/23 08:10:35 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.62 2011/06/22 08:49:54 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.63 2011/06/23 08:10:35 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -433,21 +433,27 @@
 {
 	uint64_t xc, val;
 
-	/*
-	 * Make sure EST is enabled.
-	 */
-	if ((sc->sc_flags & ACPICPU_FLAG_P_FFH) != 0) {
+	switch (cpu_vendor) {
 
-		val = rdmsr(MSR_MISC_ENABLE);
+	case CPUVENDOR_IDT:
+	case CPUVENDOR_INTEL:
 
-		if ((val & MSR_MISC_ENABLE_EST) == 0) {
+		/*
+		 * Make sure EST is enabled.
+		 */
+		if ((sc->sc_flags & ACPICPU_FLAG_P_FFH) != 0) {
 
-			val |= MSR_MISC_ENABLE_EST;
-			wrmsr(MSR_MISC_ENABLE, val);
 			val = rdmsr(MSR_MISC_ENABLE);
 
-			if ((val & MSR_MISC_ENABLE_EST) == 0)
-				return ENOTTY;
+			if ((val & MSR_MISC_ENABLE_EST) == 0) {
+
+				val |= MSR_MISC_ENABLE_EST;
+				wrmsr(MSR_MISC_ENABLE, val);
+				val = rdmsr(MSR_MISC_ENABLE);
+
+				if ((val & MSR_MISC_ENABLE_EST) == 0)
+					return ENOTTY;
+			}
 		}
 	}