 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.15 2010/08/08 16:58:42 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.16 2010/08/08 18:25:06 jruoho 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_cstate.c,v 1.15 2010/08/08 16:58:42 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.16 2010/08/08 18:25:06 jruoho Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/once.h>
 #include <sys/mutex.h>
 #include <sys/timetc.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/acpi/acpireg.h>
 @@ -124,27 +124,27 @@ acpicpu_cstate_attach_print(struct acpic
 		case ACPICPU_C_STATE_FFH:
 			str = "FFH";
 			break;
 		case ACPICPU_C_STATE_SYSIO:
 			str = "SYSIO";
 			break;
 		default:
 			panic("NOTREACHED");
+		}
-		aprint_verbose_dev(sc->sc_dev, "C%d: %5s, "
+		aprint_debug_dev(sc->sc_dev, "C%d: %5s, "
 		    "lat %3u us, pow %5u mW, addr 0x%06x, flags 0x%02x\n",
 		    i, str, cs->cs_latency, cs->cs_power,
 		    (uint32_t)cs->cs_addr, cs->cs_flags);
+	}
+}
 int
 acpicpu_cstate_detach(device_t self)
+{
 	struct acpicpu_softc *sc = device_private(self);
 	static ONCE_DECL(once_detach);
 	int rv;
 @@ -276,30 +276,26 @@ acpicpu_cstate_cst(struct acpicpu_softc
 		elm = &obj->Package.Elements[i];
 		rv = acpicpu_cstate_cst_add(sc, elm);
 		if (ACPI_SUCCESS(rv))
 			count++;
+	}
 	rv = (count != 0) ? AE_OK : AE_NOT_EXIST;
 out:
 	if (buf.Pointer != NULL)
 		ACPI_FREE(buf.Pointer);
 	if (ACPI_FAILURE(rv))
 		aprint_error_dev(sc->sc_dev, "failed to evaluate "
 		    "_CST: %s\n", AcpiFormatException(rv));
 	return rv;
+}
 static ACPI_STATUS
 acpicpu_cstate_cst_add(struct acpicpu_softc *sc, ACPI_OBJECT *elm)
+{
 	const struct acpicpu_object *ao = &sc->sc_object;
 	struct acpicpu_cstate *cs = sc->sc_cstate;
 	struct acpicpu_cstate state;
 	struct acpicpu_reg *reg;
 	ACPI_STATUS rv = AE_OK;
 	ACPI_OBJECT *obj;
 	uint32_t type;
 @@ -413,27 +409,27 @@ acpicpu_cstate_cst_add(struct acpicpu_so
 		switch (type) {
 		case ACPI_STATE_C1:
 			if ((sc->sc_flags & ACPICPU_FLAG_C_FFH) == 0)
 				state.cs_method = ACPICPU_C_STATE_HALT;
 			break;
 		default:
 			if ((sc->sc_flags & ACPICPU_FLAG_C_FFH) == 0) {
-				rv = AE_AML_BAD_RESOURCE_VALUE;
+				rv = AE_SUPPORT;
 				goto out;
+			}
+		}
 		if (sc->sc_cap != 0) {
 			/*
 			 * The _CST FFH GAS encoding may contain
 			 * additional hints on Intel processors.
 			 * Use these to determine whether we can
 			 * avoid the bus master activity check.
 			 */
 			if ((reg->reg_accesssize & ACPICPU_PDC_GAS_BM) == 0)
 @@ -450,28 +446,28 @@ acpicpu_cstate_cst_add(struct acpicpu_so
 	if (cs[type].cs_method != 0) {
 		rv = AE_ALREADY_EXISTS;
 		goto out;
+	}
 	cs[type].cs_addr = state.cs_addr;
 	cs[type].cs_power = state.cs_power;
 	cs[type].cs_flags = state.cs_flags;
 	cs[type].cs_method = state.cs_method;
 	cs[type].cs_latency = state.cs_latency;
 out:
 	if (ACPI_FAILURE(rv))
-		aprint_verbose_dev(sc->sc_dev,
+		aprint_debug_dev(sc->sc_dev, "invalid "
-		    "invalid _CST: %s\n", AcpiFormatException(rv));
+		    "_CST: %s\n", AcpiFormatException(rv));
 	return rv;
+}
 static void
 acpicpu_cstate_cst_bios(void)
+{
 	const uint8_t val = AcpiGbl_FADT.CstControl;
 	const uint32_t addr = AcpiGbl_FADT.SmiCommand;
 	if (addr == 0)
 		return;

 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_cpu_pstate.c,v 1.3 2010/08/08 18:10:34 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_pstate.c,v 1.4 2010/08/08 18:25:06 jruoho 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_pstate.c,v 1.3 2010/08/08 18:10:34 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.4 2010/08/08 18:25:06 jruoho Exp $");
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/once.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_cpu.h>
 #define _COMPONENT	 ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME	 ("acpi_cpu_pstate")
 static void		 acpicpu_pstate_attach_print(struct acpicpu_softc *);
 @@ -375,36 +375,36 @@ acpicpu_pstate_pct(struct acpicpu_softc
 		switch (reg[i]->reg_spaceid) {
 		case ACPI_ADR_SPACE_SYSTEM_IO:
 			if (reg[i]->reg_addr == 0) {
 				rv = AE_AML_ILLEGAL_ADDRESS;
 				goto out;
+			}
 			width = reg[i]->reg_bitwidth;
 			if (width != 8 && width != 16 && width != 32) {
-				rv = AE_SUPPORT;
+				rv = AE_AML_BAD_RESOURCE_VALUE;
 				goto out;
+			}
 			break;
 		case ACPI_ADR_SPACE_FIXED_HARDWARE:
 			if ((sc->sc_flags & ACPICPU_FLAG_P_FFH) == 0) {
-				rv = AE_AML_BAD_RESOURCE_VALUE;
+				rv = AE_SUPPORT;
 				goto out;
+			}
 			break;
 		default:
 			rv = AE_AML_INVALID_SPACE_ID;
 			goto out;
+		}
+	}
 	if (reg[0]->reg_spaceid != reg[1]->reg_spaceid) {
 		rv = AE_AML_INVALID_SPACE_ID;