 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.39 2011/02/15 17:50:46 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.40 2011/02/24 13:19:36 jmcneill Exp $ */
 /*-
  * Copyright (c) 2010 Jukka Ruohonen <jruohonen@iki.fi>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.39 2011/02/15 17:50:46 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.40 2011/02/24 13:19:36 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kcore.h>
 #include <sys/sysctl.h>
 #include <sys/xcall.h>
 #include <x86/cpu.h>
 #include <x86/cpufunc.h>
 #include <x86/cputypes.h>
 #include <x86/cpuvar.h>
 #include <x86/cpu_msr.h>
 #include <x86/machdep.h>
 @@ -50,27 +50,27 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.
 #include <machine/acpi_machdep.h>
 /*
  * AMD C1E.
  */
 #define MSR_CMPHALT		0xc0010055
 #define MSR_CMPHALT_SMI		__BIT(27)
 #define MSR_CMPHALT_C1E		__BIT(28)
 #define MSR_CMPHALT_BMSTS	__BIT(29)
 /*
- * AMD families 10h and 11h.
+ * AMD families 10h, 11h, and 14h
  */
 #define MSR_10H_LIMIT		0xc0010061
 #define MSR_10H_CONTROL		0xc0010062
 #define MSR_10H_STATUS		0xc0010063
 #define MSR_10H_CONFIG		0xc0010064
 /*
  * AMD family 0Fh.
  */
 #define MSR_0FH_CONTROL		0xc0010041
 #define MSR_0FH_STATUS		0xc0010042
 #define MSR_0FH_STATUS_CFID	__BITS( 0,  5)
 @@ -261,37 +261,40 @@ acpicpu_md_quirks(void)
 		case 0x0f:
 			if ((regs[3] & CPUID_APM_FID) == 0)
 				break;
 			if ((regs[3] & CPUID_APM_VID) == 0)
 				break;
 			val |= ACPICPU_FLAG_P_FFH | ACPICPU_FLAG_P_FIDVID;
 			break;
 		case 0x10:
 		case 0x11:
 			val |= ACPICPU_FLAG_C_C1E;
 			/* FALLTHROUGH */
 		case 0x14: /* AMD Fusion */
 			if ((regs[3] & CPUID_APM_TSC) != 0)
 				val &= ~ACPICPU_FLAG_C_TSC;
 			if ((regs[3] & CPUID_APM_HWP) != 0)
 				val |= ACPICPU_FLAG_P_FFH;
 			if ((regs[3] & CPUID_APM_CPB) != 0)
 				val |= ACPICPU_FLAG_P_TURBO;
 			val |= ACPICPU_FLAG_C_C1E;
 			break;
+		}
 		break;
+	}
 	/*
 	 * There are several erratums for PIIX4.
 	 */
 	if (pci_find_device(&pa, acpicpu_md_quirks_piix4) != 0)
 		val |= ACPICPU_FLAG_PIIX4;
 	return val;
 @@ -485,26 +488,27 @@ acpicpu_md_pstate_pss(struct acpicpu_sof
 		if (family == 0xf)
 			family += CPUID2EXTFAMILY(ci->ci_signature);
 		switch (family) {
 		case 0x0f:
 			msr.ps_control_addr = MSR_0FH_CONTROL;
 			msr.ps_status_addr  = MSR_0FH_STATUS;
 			break;
 		case 0x10:
 		case 0x11:
 		case 0x14: /* AMD Fusion */
 			msr.ps_control_addr = MSR_10H_CONTROL;
 			msr.ps_control_mask = __BITS(0, 2);
 			msr.ps_status_addr  = MSR_10H_STATUS;
 			msr.ps_status_mask  = __BITS(0, 2);
 			break;
 		default:
 			if ((sc->sc_flags & ACPICPU_FLAG_P_XPSS) == 0)
 				return EOPNOTSUPP;
+		}