 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_machdep.c,v 1.5 2011/06/12 11:31:30 jruoho Exp $	*/
+/*	$NetBSD: acpi_machdep.c,v 1.6 2012/09/23 00:31:05 chs Exp $	*/
 /*
  * Copyright (c) 2009 KIYOHARA Takashi
  * 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
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -18,27 +18,27 @@
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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.
  */
 /*
  * Machine-dependent routines for ACPICA.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.5 2011/06/12 11:31:30 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.6 2012/09/23 00:31:05 chs Exp $");
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 #include <machine/efi.h>
 #include <machine/intrdefs.h>
 #include <dev/acpi/acpica.h>
 #include <dev/acpi/acpivar.h>
 #include <machine/acpi_machdep.h>
 @@ -179,24 +179,24 @@ acpi_md_OsDisableInterrupt(void)
 uint32_t
 acpi_md_pdc(void)
+{
 	return 0;
+}
 uint32_t
 acpi_md_ncpus(void)
+{
 	return 0;		/* XXX. */
+}
 void
-acpi_md_callback(void)
+acpi_md_callback(struct acpi_softc *sc)
+{
 	/* Nothing. */
+}
 int
 acpi_md_sleep(int state)
+{
 printf("%s: not yet...\n", __func__);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_machdep.h,v 1.5 2011/06/12 11:31:30 jruoho Exp $	*/
+/*	$NetBSD: acpi_machdep.h,v 1.6 2012/09/23 00:31:05 chs Exp $	*/
 ACPI_STATUS		acpi_md_OsInitialize(void);
 ACPI_PHYSICAL_ADDRESS	acpi_md_OsGetRootPointer(void);
 #define acpi_md_OsIn8(x)	inb((x))
 #define acpi_md_OsIn16(x)	inw((x))
 #define acpi_md_OsIn32(x)	inl((x))
 #define acpi_md_OsOut8(x, v)	outb((x), (v))
 #define acpi_md_OsOut16(x, v)	outw((x), (v))
 #define acpi_md_OsOut32(x, v)	outl((x), (v))
 ACPI_STATUS acpi_md_OsInstallInterruptHandler(UINT32, ACPI_OSD_HANDLER,
 @@ -18,14 +18,15 @@ void acpi_md_OsRemoveInterruptHandler(vo
 ACPI_STATUS acpi_md_OsMapMemory(ACPI_PHYSICAL_ADDRESS, UINT32, void **);
 void acpi_md_OsUnmapMemory(void *, UINT32);
 ACPI_STATUS acpi_md_OsGetPhysicalAddress(void *LogicalAddress,
 					 ACPI_PHYSICAL_ADDRESS *PhysicalAddress);
 BOOLEAN		acpi_md_OsReadable(void *, UINT32);
 BOOLEAN		acpi_md_OsWritable(void *, UINT32);
 void		acpi_md_OsEnableInterrupt(void);
 void		acpi_md_OsDisableInterrupt(void);
 int		acpi_md_sleep(int);
 uint32_t	acpi_md_pdc(void);
 uint32_t	acpi_md_ncpus(void);
-void		acpi_md_callback(void);
+struct acpi_softc;
 void		acpi_md_callback(struct acpi_softc *);

 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_machdep.c,v 1.3 2012/01/30 21:47:24 rmind Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.4 2012/09/23 00:31:05 chs Exp $ */
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * Machine-dependent routines for ACPICA.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.3 2012/01/30 21:47:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.4 2012/09/23 00:31:05 chs Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpufunc.h>
 #include <dev/acpi/acpica.h>
 #include <dev/acpi/acpivar.h>
 @@ -273,24 +273,24 @@ acpi_md_OsDisableInterrupt(void)
 void
 acpi_md_OsEnableInterrupt(void)
+{
 	x86_enable_intr();
+}
 uint32_t
 acpi_md_ncpus(void)
+{
 	return kcpuset_countset(kcpuset_attached);
+}
 void
-acpi_md_callback(void)
+acpi_md_callback(struct acpi_softc *sc)
+{
 #ifdef MPBIOS
 	if (!mpbios_scanned)
 #endif
-	mpacpi_find_interrupts(acpi_softc);
+	mpacpi_find_interrupts(sc);
 #ifndef XEN
 	acpi_md_sleep_init();
 #endif
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_machdep.h,v 1.10 2011/06/12 11:31:31 jruoho Exp $	*/
+/*	$NetBSD: acpi_machdep.h,v 1.11 2012/09/23 00:31:05 chs Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -65,16 +65,17 @@ void		acpi_md_OsUnmapMemory(void *, UINT
 ACPI_STATUS	acpi_md_OsGetPhysicalAddress(void *LogicalAddress,
 		    ACPI_PHYSICAL_ADDRESS *PhysicalAddress);
 BOOLEAN		acpi_md_OsReadable(void *, UINT32);
 BOOLEAN		acpi_md_OsWritable(void *, UINT32);
 void		acpi_md_OsDisableInterrupt(void);
 void		acpi_md_OsEnableInterrupt(void);
 int		acpi_md_sleep(int);
 void		acpi_md_sleep_init(void);
 uint32_t	acpi_md_pdc(void);
 uint32_t	acpi_md_ncpus(void);
-void		acpi_md_callback(void);
+struct acpi_softc;
 void		acpi_md_callback(struct acpi_softc *);
 #endif /* !_X86_ACPI_MACHDEP_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mpacpi.c,v 1.94 2012/04/27 04:32:27 jruoho Exp $	*/
+/*	$NetBSD: mpacpi.c,v 1.95 2012/09/23 00:31:05 chs Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden for Wasabi Systems, 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,27 +26,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: mpacpi.c,v 1.94 2012/04/27 04:32:27 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.95 2012/09/23 00:31:05 chs Exp $");
 #include "acpica.h"
 #include "opt_acpi.h"
 #include "opt_mpbios.h"
 #include "opt_multiprocessor.h"
 #include "pchb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/queue.h>
 @@ -81,47 +81,44 @@ ACPI_MODULE_NAME       ("mpacpi")
 #include "ioapic.h"
 #include "lapic.h"
 #include "locators.h"
 /* XXX room for PCI-to-PCI bus */
 #define BUS_BUFFER (16)
 #if NPCI > 0
 struct mpacpi_pcibus {
 	TAILQ_ENTRY(mpacpi_pcibus) mpr_list;
 	ACPI_HANDLE mpr_handle;		/* Same thing really, but.. */
 	ACPI_BUFFER mpr_buf;		/* preserve _PRT */
 	int mpr_seg;			/* PCI segment number */
 	int mpr_bus;			/* PCI bus number */
 };
 static TAILQ_HEAD(, mpacpi_pcibus) mpacpi_pcibusses;
 #endif
 static int mpacpi_cpuprint(void *, const char *);
 static int mpacpi_ioapicprint(void *, const char *);
 /* acpi_madt_walk callbacks */
 static ACPI_STATUS mpacpi_count(ACPI_SUBTABLE_HEADER *, void *);
 static ACPI_STATUS mpacpi_config_cpu(ACPI_SUBTABLE_HEADER *, void *);
 static ACPI_STATUS mpacpi_config_ioapic(ACPI_SUBTABLE_HEADER *, void *);
 static ACPI_STATUS mpacpi_nonpci_intr(ACPI_SUBTABLE_HEADER *, void *);
 #if NPCI > 0
 /* Callbacks for the ACPI namespace walk */
 static ACPI_STATUS mpacpi_pcibus_cb(ACPI_HANDLE, uint32_t, void *, void **);
 static int mpacpi_derive_bus(ACPI_HANDLE, struct acpi_softc *);
 static int mpacpi_pcircount(struct mpacpi_pcibus *);
 static int mpacpi_pciroute(struct mpacpi_pcibus *);
 static int mpacpi_find_pcibusses(struct acpi_softc *);
 static void mpacpi_print_pci_intr(int);
 #endif
 static void mpacpi_config_irouting(struct acpi_softc *);
 static void mpacpi_print_intr(struct mp_intr_map *);
 static void mpacpi_print_isa_intr(int);
 static void mpacpi_user_continue(const char *fmt, ...);
 @@ -474,306 +471,94 @@ mpacpi_scan_apics(device_t self, int *nc
 	if (!mpacpi_force &&
 	    (acpi_find_quirks() & (ACPI_QUIRK_BADPCI)) != 0)
 		goto done;
 #endif
 	rv = 1;
 done:
 	*ncpup = mpacpi_ncpu;
 	acpi_madt_unmap();
 	return rv;
+}
 #if NPCI > 0
-/*
+static void
- * Find all PCI busses from ACPI namespace and construct mpacpi_pcibusses list.
+mpacpi_pci_foundbus(struct acpi_devnode *ad)
  * Note:
  * We cannot find all PCI busses in the system from ACPI namespace.
  * For example, a PCI-to-PCI bridge on an add-on PCI card is not
  * described in the ACPI namespace.
  * We search valid devices which have _PRT (PCI interrupt routing table)
  * method.
  * Such devices are either one of PCI root bridge or PCI-to-PCI bridge.
  */
 static int
 mpacpi_find_pcibusses(struct acpi_softc *acpi)
 	ACPI_HANDLE sbhandle;
 	if (AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sbhandle) != AE_OK)
 		return ENOENT;
 	TAILQ_INIT(&mpacpi_pcibusses);
 	AcpiWalkNamespace(ACPI_TYPE_DEVICE, sbhandle, 100,
 	    mpacpi_pcibus_cb, NULL, acpi, NULL);
 	return 0;
 static const char * const pciroot_hid[] = {
 	"PNP0A03",			/* PCI root bridge */
 	"PNP0A08",			/* PCI-X root bridge */
 	NULL
 };
 /*
  * mpacpi_get_bbn:
  * Get or guess the Base Bus Number and sanity check it.
  */
 static ACPI_STATUS
 mpacpi_get_bbn(struct acpi_softc *acpi, ACPI_HANDLE handle, int *bus)
 	ACPI_STATUS rv;
 	ACPI_INTEGER val;
 #if NPCHB > 0
 	pcireg_t class, dvid;
 	pcitag_t tag;
 #endif
 	rv = acpi_eval_integer(handle, METHOD_NAME__BBN, &val);
 	if (ACPI_SUCCESS(rv))
 		*bus = ACPI_LOWORD(val);
 	else
 		*bus = 0;
 	/* If the _BBN is not 0, assume it is valid. */
 	if (*bus != 0)
 		return AE_OK;
 	rv = acpi_eval_integer(handle, METHOD_NAME__ADR, &val);
 	if (ACPI_FAILURE(rv) || val == 0xffffffff)
 		return AE_ERROR;
 	/* If the _ADR is also 0, assume the _BBN is valid. */
 	if (val == 0)
 		return AE_OK;
 #if NPCHB > 0
 	tag = pci_make_tag(acpi->sc_pc, 0,
 	    ACPI_HIWORD(val), ACPI_LOWORD(val));
 	dvid = pci_conf_read(acpi->sc_pc, tag, PCI_ID_REG);
 	if (PCI_VENDOR(dvid) == PCI_VENDOR_INVALID || PCI_VENDOR(dvid) == 0)
 		return AE_ERROR;
 	/* Check if this is a host bridge device. */
 	class = pci_conf_read(acpi->sc_pc, tag, PCI_CLASS_REG);
 	if (PCI_CLASS(class) != PCI_CLASS_BRIDGE ||
 	    PCI_SUBCLASS(class) != PCI_SUBCLASS_BRIDGE_HOST)
 		return AE_ERROR;
 	*bus = pchb_get_bus_number(acpi->sc_pc, tag);
 	return *bus != -1 ? AE_OK : AE_ERROR;
 #else
 	return AE_ERROR;
 #endif
 /*
  * mpacpi_derive_bus:
  * Derive PCI bus number for the ACPI handle.
  * If a device is not a PCI root bridge, it doesn't have _BBN method
  * and we have no direct method to know the bus number.
  * We have to walk up to search its root bridge and then walk down
  * to resolve the bus number.
  */
 static int
 mpacpi_derive_bus(ACPI_HANDLE handle, struct acpi_softc *acpi)
+{
-	ACPI_HANDLE parent, current;
+	struct mpacpi_pcibus *mpr;
-	ACPI_STATUS rv;
+	ACPI_BUFFER buf;
-	ACPI_INTEGER val;
+	int rv;
 	ACPI_DEVICE_INFO *devinfo;
 	struct ac_dev {
 		TAILQ_ENTRY(ac_dev) list;
 		ACPI_HANDLE handle;
 	};
 	TAILQ_HEAD(, ac_dev) dev_list;
 	struct ac_dev *dev;
 	pcireg_t binf, class, dvid;
 	pcitag_t tag;
 	int bus;
 	TAILQ_INIT(&dev_list);
 	/* first, search parent root bus */
 	for (current = handle;; current = parent) {
 		rv = AcpiGetObjectInfo(current, &devinfo);
 		if (ACPI_FAILURE(rv))
 			goto out;
 		/* add this device to the list only if it's active */
 		if ((devinfo->Valid & ACPI_VALID_STA) == 0 ||
 		    (devinfo->CurrentStatus & ACPI_STA_OK) == ACPI_STA_OK) {
 			ACPI_FREE(devinfo);
 			dev = kmem_zalloc(sizeof(struct ac_dev), KM_SLEEP);
 			if (dev == NULL) {
 				rv = AE_NO_MEMORY;
 				goto out;
 			dev->handle = current;
 			TAILQ_INSERT_HEAD(&dev_list, dev, list);
 		} else
 			ACPI_FREE(devinfo);
 		rv = AcpiGetParent(current, &parent);
 		if (ACPI_FAILURE(rv))
 			goto out;
 		rv = AcpiGetObjectInfo(parent, &devinfo);
 		if (ACPI_FAILURE(rv))
 			goto out;
 		if (acpi_match_hid(devinfo, pciroot_hid)) {
 			rv = mpacpi_get_bbn(acpi, parent, &bus);
 			if (ACPI_FAILURE(rv))
 				bus = 0;
 			ACPI_FREE(devinfo);
 			break;
 		ACPI_FREE(devinfo);
 	/*
-	 * second, we walk down from the root to the target
+	 * set mpr_buf from _PRT (if it exists).
-	 * resolving the bus number
+	 * set mpr_seg and mpr_bus from previously cached info.
 	 */
 	TAILQ_FOREACH(dev, &dev_list, list) {
 		rv = acpi_eval_integer(dev->handle, METHOD_NAME__ADR, &val);
 		if (ACPI_FAILURE(rv) || val == 0xffffffff) {
 			rv = AE_ERROR;
 			goto out;
 		tag = pci_make_tag(acpi->sc_pc, bus,
 		    ACPI_HIWORD(val), ACPI_LOWORD(val));
 		/* check if this device exists */
 		dvid = pci_conf_read(acpi->sc_pc, tag, PCI_ID_REG);
 		if (PCI_VENDOR(dvid) == PCI_VENDOR_INVALID ||
 		    PCI_VENDOR(dvid) == 0) {
 			rv = AE_NOT_EXIST;
 			goto out;
 		/* check if this is a bridge device */
 		class = pci_conf_read(acpi->sc_pc, tag, PCI_CLASS_REG);
 		if (PCI_CLASS(class) != PCI_CLASS_BRIDGE ||
 		    PCI_SUBCLASS(class) != PCI_SUBCLASS_BRIDGE_PCI) {
 			rv = AE_TYPE;
 			goto out;
 		/* if this is a bridge, get secondary bus */
 		binf = pci_conf_read(acpi->sc_pc, tag, PPB_REG_BUSINFO);
 		bus = PPB_BUSINFO_SECONDARY(binf);
 out:
 	/* cleanup */
 	while (!TAILQ_EMPTY(&dev_list)) {
 		dev = TAILQ_FIRST(&dev_list);
 		TAILQ_REMOVE(&dev_list, dev, list);
 		kmem_free(dev, sizeof(struct ac_dev));
 	if (ACPI_FAILURE(rv))
 		bus = -1;
 	return bus;
 /*
  * Callback function for a namespace walk through ACPI space, finding all
  * PCI root and subordinate busses.
  */
 static ACPI_STATUS
 mpacpi_pcibus_cb(ACPI_HANDLE handle, uint32_t level, void *p,
     void **status)
 	ACPI_STATUS rv;
 	ACPI_DEVICE_INFO *devinfo;
 	struct mpacpi_pcibus *mpr;
 	struct acpi_softc *acpi = p;
 	/* get _HID, _CID and _STA */
 	rv = AcpiGetObjectInfo(handle, &devinfo);
 	if (ACPI_FAILURE(rv))
 		return AE_OK;
 	/* if this device is not active, ignore it */
 	if ((devinfo->Valid & ACPI_VALID_STA) &&
 	    (devinfo->CurrentStatus & ACPI_STA_OK) != ACPI_STA_OK)
 		goto out;
-	mpr = kmem_zalloc(sizeof(struct mpacpi_pcibus), KM_SLEEP);
+	rv = acpi_get(ad->ad_handle, &buf, AcpiGetIrqRoutingTable);
 	if (mpr == NULL) {
 		ACPI_FREE(devinfo);
 		return AE_NO_MEMORY;
 	/* try get _PRT. if this fails, we're not interested in it */
 	rv = acpi_get(handle, &mpr->mpr_buf, AcpiGetIrqRoutingTable);
 	if (ACPI_FAILURE(rv)) {
-		kmem_free(mpr, sizeof(struct mpacpi_pcibus));
+		buf.Length = 0;
-		goto out;
+		buf.Pointer = NULL;
+	}
-	/* check whether this is PCI root bridge or not */
+	mpr = kmem_zalloc(sizeof(struct mpacpi_pcibus), KM_SLEEP);
-	if (acpi_match_hid(devinfo, pciroot_hid)) {
+	if ((ad->ad_devinfo->Flags & ACPI_PCI_ROOT_BRIDGE) != 0) {
 		/* this is PCI root bridge */
 		rv = mpacpi_get_bbn(acpi, handle, &mpr->mpr_bus);
 		if (ACPI_FAILURE(rv)) {
 			if (mpacpi_npciroots)
 				panic("mpacpi: PCI root bridge with broken _BBN");
 			/* For the first bus we find, assume the BBN is 0. */
 			mpr->mpr_bus = 0;
 		if (mp_verbose)
-			printf("mpacpi: found root PCI bus %d at level %u\n",
+			printf("mpacpi: found root PCI bus %d\n",
-			    mpr->mpr_bus, level);
+			    mpr->mpr_bus);
 		mpacpi_npciroots++;
 	} else {
 		/* this is subordinate PCI bus (behind PCI-to-PCI bridge) */
 		/* we have no direct method to get the bus number... */
 		mpr->mpr_bus = mpacpi_derive_bus(handle, acpi);
 		if (mpr->mpr_bus < 0) {
 			if (mp_verbose)
 				printf("mpacpi: failed to derive bus number, ignoring\n");
 			kmem_free(mpr, sizeof(struct mpacpi_pcibus));
 			goto out;
 		if (mp_verbose)
-			printf("mpacpi: found subordinate bus %d at level %u\n",
+			printf("mpacpi: found subordinate bus %d\n",
-			    mpr->mpr_bus, level);
+			    mpr->mpr_bus);
+	}
-	mpr->mpr_handle = handle;
+	mpr->mpr_handle = ad->ad_handle;
 	mpr->mpr_buf = buf;
 	mpr->mpr_seg = ad->ad_pciinfo->ap_segment;
 	mpr->mpr_bus = ad->ad_pciinfo->ap_downbus;
 	TAILQ_INSERT_TAIL(&mpacpi_pcibusses, mpr, mpr_list);
 	/*
 	 * XXX this wrongly assumes that bus numbers are unique
 	 * even between segments.
 	 */
 	if (mpr->mpr_bus > mpacpi_maxpci)
 		mpacpi_maxpci = mpr->mpr_bus;
 	mpacpi_npci++;
+}
  out:
-	ACPI_FREE(devinfo);
+static void
-	return AE_OK;
+mpacpi_pci_walk(struct acpi_devnode *ad)
+{
 	struct acpi_devnode *child;
 	if (ad->ad_pciinfo &&
 	    (ad->ad_pciinfo->ap_flags & ACPI_PCI_INFO_BRIDGE) != 0) {
 		mpacpi_pci_foundbus(ad);
+	}
 	SIMPLEQ_FOREACH(child, &ad->ad_child_head, ad_child_list) {
 		mpacpi_pci_walk(child);
+	}
+}
 static int
 mpacpi_find_pcibusses(struct acpi_softc *sc)
+{
 	TAILQ_INIT(&mpacpi_pcibusses);
 	mpacpi_pci_walk(sc->sc_root);
 	return 0;
+}
 /*
  * Find all static PRT entries for a PCI bus.
  */
 static int
 mpacpi_pciroute(struct mpacpi_pcibus *mpr)
+{
 	ACPI_PCI_ROUTING_TABLE *ptrp;
         ACPI_HANDLE linkdev;
 	char *p;
 	struct mp_intr_map *mpi, *iter;
 	struct mp_bus *mpb;
 @@ -788,26 +573,30 @@ mpacpi_pciroute(struct mpacpi_pcibus *mp
 	mpb = &mp_busses[mpr->mpr_bus];
 	if (mpb->mb_name != NULL)
 		printf("mpacpi: PCI bus %d int routing already done!\n",
 		    mpr->mpr_bus);
 	mpb->mb_intrs = NULL;
 	mpb->mb_name = "pci";
 	mpb->mb_idx = mpr->mpr_bus;
 	mpb->mb_intr_print = mpacpi_print_pci_intr;
 	mpb->mb_intr_cfg = NULL;
 	mpb->mb_data = 0;
 	if (mpr->mpr_buf.Length == 0) {
 		goto out;
+	}
 	for (p = mpr->mpr_buf.Pointer; ; p += ptrp->Length) {
 		ptrp = (ACPI_PCI_ROUTING_TABLE *)p;
 		if (ptrp->Length == 0)
 			break;
 		dev = ACPI_HIWORD(ptrp->Address);
 		if (ptrp->Source[0] == 0 &&
 		    (ptrp->SourceIndex == 14 || ptrp->SourceIndex == 15)) {
 			printf("Skipping PCI routing entry for PCI IDE compat IRQ");
 			continue;
+		}
 		mpi = &mp_intrs[mpacpi_intr_index];
 @@ -883,42 +672,47 @@ mpacpi_pciroute(struct mpacpi_pcibus *mp
 			if (mp_verbose > 1)
 				printf("pciroute: done adding entry\n");
+		}
 		mpi->cpu_id = 0;
 		mpi->next = mpb->mb_intrs;
 		mpb->mb_intrs = mpi;
+	}
 	ACPI_FREE(mpr->mpr_buf.Pointer);
 	mpr->mpr_buf.Pointer = NULL;	/* be preventive to bugs */
 out:
 	if (mp_verbose > 1)
 		printf("pciroute: done\n");
 	return 0;
+}
 /*
  * Count number of elements in _PRT
  */
 static int
 mpacpi_pcircount(struct mpacpi_pcibus *mpr)
+{
 	int count = 0;
 	ACPI_PCI_ROUTING_TABLE *PrtElement;
 	uint8_t *Buffer;
 	if (mpr->mpr_buf.Length == 0) {
 		return 0;
+	}
 	for (Buffer = mpr->mpr_buf.Pointer;; Buffer += PrtElement->Length) {
 		PrtElement = (ACPI_PCI_ROUTING_TABLE *)Buffer;
 		if (PrtElement->Length == 0)
 			break;
 		count++;
+	}
 	return count;
+}
 #endif
 /*
  * Set up the interrupt config lists, in the same format as the mpbios does.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi.c,v 1.254 2012/08/14 14:38:02 jruoho Exp $	*/
+/*	$NetBSD: acpi.c,v 1.255 2012/09/23 00:31:06 chs 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.
 @@ -90,27 +90,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.254 2012/08/14 14:38:02 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.255 2012/09/23 00:31:06 chs Exp $");
 #include "opt_acpi.h"
 #include "opt_pcifixup.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 @@ -180,26 +180,27 @@ static const char * const acpi_early_ids
 	"PNP0C09",	/* acpiec(4) */
 	NULL
 };
 static int		acpi_match(device_t, cfdata_t, void *);
 static int		acpi_submatch(device_t, cfdata_t, const int *, void *);
 static void		acpi_attach(device_t, device_t, void *);
 static int		acpi_detach(device_t, int);
 static void		acpi_childdet(device_t, device_t);
 static bool		acpi_suspend(device_t, const pmf_qual_t *);
 static bool		acpi_resume(device_t, const pmf_qual_t *);
 static void		acpi_build_tree(struct acpi_softc *);
 static void		acpi_config_tree(struct acpi_softc *);
 static ACPI_STATUS	acpi_make_devnode(ACPI_HANDLE, uint32_t,
 					  void *, void **);
 static ACPI_STATUS	acpi_make_devnode_post(ACPI_HANDLE, uint32_t,
 					       void *, void **);
 static void		acpi_make_name(struct acpi_devnode *, uint32_t);
 static int		acpi_rescan(device_t, const char *, const int *);
 static void		acpi_rescan_early(struct acpi_softc *);
 static void		acpi_rescan_nodes(struct acpi_softc *);
 static void		acpi_rescan_capabilities(device_t);
 static int		acpi_print(void *aux, const char *);
 static void		acpi_notify_handler(ACPI_HANDLE, uint32_t, void *);
 @@ -452,55 +453,50 @@ acpi_attach(device_t parent, device_t se
 	sc->sc_pciflags = aa->aa_pciflags;
 	sc->sc_ic = aa->aa_ic;
 	SIMPLEQ_INIT(&sc->ad_head);
 	acpi_softc = sc;
 	if (pmf_device_register(self, acpi_suspend, acpi_resume) != true)
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	/*
 	 * Bring ACPICA on-line.
 	 */
 #define ACPI_ENABLE_PHASE1 \
     (ACPI_NO_HANDLER_INIT | ACPI_NO_EVENT_INIT)
 #define ACPI_ENABLE_PHASE2 \
     (ACPI_NO_HARDWARE_INIT | ACPI_NO_ACPI_ENABLE | \
      ACPI_NO_ADDRESS_SPACE_INIT)
-	rv = AcpiEnableSubsystem(ACPI_ENABLE_PHASE1);
+	rv = AcpiEnableSubsystem(ACPI_FULL_INITIALIZATION);
 	if (ACPI_FAILURE(rv))
 		goto fail;
 	acpi_md_callback();
 	rv = AcpiEnableSubsystem(ACPI_ENABLE_PHASE2);
 	if (ACPI_FAILURE(rv))
 		goto fail;
 	/*
 	 * Early initialization of acpiec(4) via ECDT.
 	 */
 	(void)config_found_ia(self, "acpiecdtbus", aa, NULL);
 	rv = AcpiInitializeObjects(ACPI_FULL_INITIALIZATION);
 	if (ACPI_FAILURE(rv))
 		goto fail;
 	/*
 	 * Scan the namespace and build our device tree.
 	 */
 	acpi_build_tree(sc);
 	acpi_md_callback(sc);
 	/*
 	 * Early initialization of the _PDC control method
 	 * that may load additional SSDT tables dynamically.
 	 */
 	(void)acpi_md_pdc();
 	/*
 	 * Install global notify handlers.
 	 */
 	rv = AcpiInstallNotifyHandler(ACPI_ROOT_OBJECT,
 	    ACPI_SYSTEM_NOTIFY, acpi_notify_handler, NULL);
 	if (ACPI_FAILURE(rv))
 		goto fail;
 @@ -514,31 +510,27 @@ acpi_attach(device_t parent, device_t se
 	acpi_active = 1;
 	/* Show SCI interrupt. */
 	aprint_verbose_dev(self, "SCI interrupting at int %u\n",
 	    AcpiGbl_FADT.SciInterrupt);
 	/*
 	 * Install fixed-event handlers.
 	 */
 	acpi_register_fixed_button(sc, ACPI_EVENT_POWER_BUTTON);
 	acpi_register_fixed_button(sc, ACPI_EVENT_SLEEP_BUTTON);
 	acpitimer_init(sc);
 	acpi_config_tree(sc);
 	/*
 	 * Scan the namespace and build our device tree.
 	 */
 	acpi_build_tree(sc);
 	acpi_sleep_init(sc);
 #ifdef ACPI_DEBUG
 	acpi_debug_init();
 #endif
 	/*
 	 * Print debug information.
 	 */
 	acpi_print_verbose(sc);
 	return;
 @@ -656,26 +648,35 @@ acpi_build_tree(struct acpi_softc *sc)
 	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.
 	 */
 	(void)acpi_pcidev_scan(sc->sc_root);
+}
 static void
 acpi_config_tree(struct acpi_softc *sc)
+{
 	/*
 	 * Configure all everything found "at acpi?".
 	 */
 	(void)acpi_rescan(sc->sc_dev, NULL, NULL);
 	/*
 	 * Update GPE information.
+	 *
 	 * Note that this must be called after
 	 * all GPE handlers have been installed.
 	 */
 	(void)AcpiUpdateAllGpes();
 	/*
 	 * Defer rest of the configuration.
 	 */