 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi.c,v 1.184 2010/04/23 18:51:31 jruoho Exp $	*/
+/*	$NetBSD: acpi.c,v 1.185 2010/04/24 13:42:18 jruoho Exp $	*/
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum of By Noon Software, Inc.
+ *
  * 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.
 @@ -55,27 +55,27 @@
  * 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 WASABI SYSTEMS, INC
  * 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.c,v 1.184 2010/04/23 18:51:31 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.185 2010/04/24 13:42:18 jruoho Exp $");
 #include "opt_acpi.h"
 #include "opt_pcifixup.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <dev/acpi/acpireg.h>
 @@ -117,26 +117,27 @@ static int acpi_dbgr = 0x00;
 /*
  * This is a flag we set when the ACPI subsystem is active.  Machine
  * dependent code may wish to skip other steps (such as attaching
  * subsystems that ACPI supercedes) when ACPI is active.
  */
 int	acpi_active;
 int	acpi_force_load;
 int	acpi_suspended = 0;
 struct acpi_softc *acpi_softc;
 static uint64_t acpi_root_pointer;
 extern kmutex_t acpi_interrupt_list_mtx;
 static ACPI_HANDLE acpi_scopes[4];
 /*
  * This structure provides a context for the ACPI
  * namespace walk performed in acpi_build_tree().
  */
 struct acpi_walkcontext {
 	struct acpi_softc	*aw_sc;
 	struct acpi_devnode	*aw_parent;
 };
 /*
  * Ignored HIDs.
  */
 @@ -193,28 +194,29 @@ static int		acpi_print(void *aux, const
 static void		acpi_notify_handler(ACPI_HANDLE, uint32_t, void *);
 static void		acpi_register_fixed_button(struct acpi_softc *, int);
 static void		acpi_deregister_fixed_button(struct acpi_softc *, int);
 static uint32_t		acpi_fixed_button_handler(void *);
 static void		acpi_fixed_button_pressed(void *);
 static void		acpi_sleep_init(struct acpi_softc *);
 static int		sysctl_hw_acpi_fixedstats(SYSCTLFN_ARGS);
 static int		sysctl_hw_acpi_sleepstate(SYSCTLFN_ARGS);
 static int		sysctl_hw_acpi_sleepstates(SYSCTLFN_ARGS);
 static bool		  acpi_is_scope(struct acpi_devnode *);
 static ACPI_TABLE_HEADER *acpi_map_rsdt(void);
-static void		acpi_unmap_rsdt(ACPI_TABLE_HEADER *);
+static void		  acpi_unmap_rsdt(ACPI_TABLE_HEADER *);
 extern struct cfdriver acpi_cd;
 CFATTACH_DECL2_NEW(acpi, sizeof(struct acpi_softc),
     acpi_match, acpi_attach, acpi_detach, NULL, acpi_rescan, acpi_childdet);
 /*
  * Probe for ACPI support.
+ *
  * This is called by the machine-dependent ACPI front-end.
  * Note: this is not an autoconfiguration interface function.
  */
 int
 @@ -574,39 +576,58 @@ acpi_resume(device_t dv, const pmf_qual_
 	acpi_suspended = 0;
 	return true;
+}
 /*
  * Namespace scan.
  */
 static void
 acpi_build_tree(struct acpi_softc *sc)
+{
 	struct acpi_walkcontext awc;
 	/*
 	 * Get the root scope handles.
 	 */
 	KASSERT(__arraycount(acpi_scopes) == 4);
 	(void)AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_PR_", &acpi_scopes[0]);
 	(void)AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_PB_", &acpi_scopes[1]);
 	(void)AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_PI_", &acpi_scopes[2]);
 	(void)AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_TZ_", &acpi_scopes[3]);
 	/*
 	 * Make the root node.
 	 */
 	awc.aw_sc = sc;
 	awc.aw_parent = NULL;
 	(void)acpi_make_devnode(ACPI_ROOT_OBJECT, 0, &awc, NULL);
 	KASSERT(sc->sc_root == NULL);
 	KASSERT(awc.aw_parent != NULL);
 	sc->sc_root = awc.aw_parent;
 	/*
 	 * Build the internal namespace.
 	 */
 	(void)AcpiWalkNamespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, UINT32_MAX,
 	    acpi_make_devnode, acpi_make_devnode_post, &awc, NULL);
 	/*
 	 * Scan the internal namespace.
 	 */
 	acpi_rescan1(sc, NULL, NULL);
 	acpi_rescan_capabilities(sc);
 	(void)acpi_pcidev_scan(sc->sc_root);
 #ifdef ACPIVERBOSE
 	aprint_normal("\n");
 	acpi_print_tree(sc->sc_root, 0);
 #endif
+}
 #ifdef ACPIVERBOSE
 static void
 @@ -954,80 +975,87 @@ acpi_rescan1(struct acpi_softc *sc, cons
+}
 static void
 acpi_rescan_nodes(struct acpi_softc *sc)
+{
 	struct acpi_attach_args aa;
 	struct acpi_devnode *ad;
 	SIMPLEQ_FOREACH(ad, &sc->ad_head, ad_list) {
 		if (ad->ad_device != NULL)
 			continue;
-		aa.aa_node = ad;
+		/*
-		aa.aa_iot = sc->sc_iot;
+		 * There is a bug in ACPICA: it defines the type
-		aa.aa_memt = sc->sc_memt;
+		 * of the scopes incorrectly for its own reasons.
-		aa.aa_pc = sc->sc_pc;
+		 */
-		aa.aa_pciflags = sc->sc_pciflags;
+		if (acpi_is_scope(ad) != false)
-		aa.aa_ic = sc->sc_ic;
+			continue;
 		/*
-		 * XXX:	We only attach devices which are present, enabled, and
+		 * We only attach devices which are present, enabled, and
-		 *	functioning properly. However, if a device is enabled,
+		 * functioning properly. However, if a device is enabled,
-		 *	it is decoding resources and we should claim these,
+		 * it is decoding resources and we should claim these,
-		 *	if possible. This requires changes to bus_space(9).
+		 * if possible. This requires changes to bus_space(9).
 		 */
 		if (ad->ad_devinfo->Type == ACPI_TYPE_DEVICE) {
 			if ((ad->ad_devinfo->Valid & ACPI_VALID_STA) ==
 			    ACPI_VALID_STA &&
 			    (ad->ad_devinfo->CurrentStatus &
 			     (ACPI_STA_DEV_PRESENT|ACPI_STA_DEV_ENABLED|
 			      ACPI_STA_DEV_OK)) !=
 			    (ACPI_STA_DEV_PRESENT|ACPI_STA_DEV_ENABLED|
 			     ACPI_STA_DEV_OK))
 				continue;
+		}
 		/*
-		 * XXX:	The same problem as above. As for example
+		 * The same problem as above. As for example
-		 *	thermal zones and power resources do not
+		 * thermal zones and power resources do not
-		 *	have a valid HID, only evaluate devices.
+		 * have a valid HID, only evaluate devices.
 		 */
 		if (ad->ad_devinfo->Type == ACPI_TYPE_DEVICE &&
 		    (ad->ad_devinfo->Valid & ACPI_VALID_HID) == 0)
 			continue;
 		/*
 		 * Handled internally.
 		 */
 		if (ad->ad_devinfo->Type == ACPI_TYPE_PROCESSOR)
 			continue;
 		/*
 		 * Ditto, but bind power resources.
 		 */
 		if (ad->ad_devinfo->Type == ACPI_TYPE_POWER) {
 			acpi_power_res_add(ad);
 			continue;
+		}
 		/*
 		 * Skip ignored HIDs.
 		 */
 		if (acpi_match_hid(ad->ad_devinfo, acpi_ignored_ids))
 			continue;
 		aa.aa_node = ad;
 		aa.aa_iot = sc->sc_iot;
 		aa.aa_memt = sc->sc_memt;
 		aa.aa_pc = sc->sc_pc;
 		aa.aa_pciflags = sc->sc_pciflags;
 		aa.aa_ic = sc->sc_ic;
 		ad->ad_device = config_found_ia(sc->sc_dev,
 		    "acpinodebus", &aa, acpi_print);
+	}
+}
 #define ACPI_STA_DEV_VALID      \
 	(ACPI_STA_DEV_PRESENT | ACPI_STA_DEV_ENABLED | ACPI_STA_DEV_OK)
 static void
 acpi_rescan_capabilities(struct acpi_softc *sc)
+{
 	struct acpi_devnode *ad;
 	ACPI_DEVICE_INFO *di;
 @@ -1656,26 +1684,52 @@ sysctl_hw_acpi_sleepstates(SYSCTLFN_ARGS
 	node.sysctl_data = &t;
 	err = sysctl_lookup(SYSCTLFN_CALL(&node));
 	if (err || newp == NULL)
 		return err;
 	return 0;
+}
 /*
  * Miscellaneous.
  */
 static bool
 acpi_is_scope(struct acpi_devnode *ad)
+{
 	int i;
 	/*
 	 * Return true if the node is a root scope.
 	 */
 	if (ad->ad_parent == NULL)
 		return false;
 	if (ad->ad_parent->ad_handle != ACPI_ROOT_OBJECT)
 		return false;
 	for (i = 0; i < __arraycount(acpi_scopes); i++) {
 		if (acpi_scopes[i] == NULL)
 			continue;
 		if (ad->ad_handle == acpi_scopes[i])
 			return true;
+	}
 	return false;
+}
 ACPI_PHYSICAL_ADDRESS
 acpi_OsGetRootPointer(void)
+{
 	ACPI_PHYSICAL_ADDRESS PhysicalAddress;
 	/*
 	 * We let MD code handle this since there are multiple ways to do it:
+	 *
 	 *	IA-32: Use AcpiFindRootPointer() to locate the RSDP.
+	 *
 	 *	IA-64: Use the EFI.
 	 */
 	PhysicalAddress = acpi_md_OsGetRootPointer();