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

[Jukka Ruohonen]

Module Name:    src
Committed By:   jruoho
Date:           Sat Aug 21 02:47:38 UTC 2010

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

Log Message:
Properly detect AMD hardware P-state support. Also detect "core boost" (only
present in some models of family 10h).


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.20 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.21
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.20	Fri Aug 20 07:00:17 2010
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c	Sat Aug 21 02:47:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.20 2010/08/20 07:00:17 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.21 2010/08/21 02:47:37 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010 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.20 2010/08/20 07:00:17 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.21 2010/08/21 02:47:37 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -111,6 +111,7 @@
 	struct cpu_info *ci = curcpu();
 	struct pci_attach_args pa;
 	uint32_t family, val = 0;
+	uint32_t regs[4];
 
 	if (acpicpu_md_cpus_running() == 1)
 		val |= ACPICPU_FLAG_C_BM;
@@ -144,8 +145,13 @@
 		case 0x10:
 		case 0x11:
 
-			if ((ci->ci_feat_val[2] & CPUID_APM_HWP) != 0)
+			x86_cpuid(0x80000007, regs);
+
+			if ((regs[3] & CPUID_APM_HWP) != 0)
 				val |= ACPICPU_FLAG_P_FFH;
+
+			if ((regs[3] & CPUID_APM_CPB) != 0)
+				val |= ACPICPU_FLAG_P_TURBO;
 		}
 
 		break;