Module Name: src
Committed By: jruoho
Date: Thu Aug 19 21:40:45 UTC 2010
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
Log Message:
Properly calculate the AMD CPU family.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 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.17 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.18
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.17 Thu Aug 19 18:30:24 2010
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Thu Aug 19 21:40:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.17 2010/08/19 18:30:24 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.18 2010/08/19 21:40:45 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen <[email protected]>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.17 2010/08/19 18:30:24 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.18 2010/08/19 21:40:45 jruoho Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -109,7 +109,7 @@
{
struct cpu_info *ci = curcpu();
struct pci_attach_args pa;
- uint32_t val = 0;
+ uint32_t family, val = 0;
if (acpicpu_md_cpus_running() == 1)
val |= ACPICPU_FLAG_C_BM;
@@ -133,7 +133,12 @@
case CPUVENDOR_AMD:
- switch (CPUID2FAMILY(ci->ci_signature)) {
+ family = CPUID2FAMILY(ci->ci_signature);
+
+ if (family == 0xf)
+ family += CPUID2EXTFAMILY(ci->ci_signature);
+
+ switch (family) {
case 0x10:
case 0x11:
@@ -461,7 +466,7 @@
{
struct acpicpu_pstate *ps, msr;
struct cpu_info *ci = curcpu();
- uint32_t i = 0;
+ uint32_t family, i = 0;
(void)memset(&msr, 0, sizeof(struct acpicpu_pstate));
@@ -478,7 +483,12 @@
case CPUVENDOR_AMD:
- switch (CPUID2FAMILY(ci->ci_signature)) {
+ family = CPUID2FAMILY(ci->ci_signature);
+
+ if (family == 0xf)
+ family += CPUID2EXTFAMILY(ci->ci_signature);
+
+ switch (family) {
case 0x10:
case 0x11:
