 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_pci.c,v 1.12 2010/06/09 04:20:10 mrg Exp $ */
+/* $NetBSD: acpi_pci.c,v 1.13 2010/08/08 16:26:47 gsutre Exp $ */
 /*
  * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christoph Egger and Gregoire Sutre.
+ *
  * 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.
 @@ -19,27 +19,27 @@
  * 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 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_pci.c,v 1.12 2010/06/09 04:20:10 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.13 2010/08/08 16:26:47 gsutre Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/ppbreg.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_pci.h>
 @@ -153,31 +153,31 @@ acpi_pcidev_pciroot_bus_callback(ACPI_RE
  *	Scan the ACPI device tree for PCI devices.  A node is detected as a
  *	PCI device if it has an ancestor that is a PCI root bridge and such
  *	that all intermediate nodes are PCI-to-PCI bridges.  Depth-first
  *	recursive implementation.
  */
 ACPI_STATUS
 acpi_pcidev_scan(struct acpi_devnode *ad)
+{
 	struct acpi_devnode *child;
 	struct acpi_pci_info *ap;
 	ACPI_INTEGER val;
 	ACPI_STATUS rv;
 	ad->ad_pciinfo = NULL;
 	if (ad->ad_devinfo->Type != ACPI_TYPE_DEVICE ||
-	    !(ad->ad_devinfo->Valid & ACPI_VALID_ADR)) {
+	    !(ad->ad_devinfo->Valid & ACPI_VALID_ADR))
 		ad->ad_pciinfo = NULL;
 		goto rec;
 	if (ad->ad_devinfo->Flags & ACPI_PCI_ROOT_BRIDGE) {
 		ap = kmem_zalloc(sizeof(*ap), KM_SLEEP);
 		if (ap == NULL)
 			return AE_NO_MEMORY;
 		/*
 		 * If no _SEG exist, all PCI bus segments are assumed
 		 * to be in the PCI segment group 0 (ACPI 4.0, p. 277).
 		 * The segment group number is conveyed in the lower
 		 * 16 bits of _SEG (the other bits are all reserved).
 @@ -190,26 +190,34 @@ acpi_pcidev_scan(struct acpi_devnode *ad
 		/* Try to get bus number using _CRS first. */
 		rv = acpi_pcidev_pciroot_bus(ad->ad_handle, &ap->ap_bus);
 		if (ACPI_FAILURE(rv)) {
 			rv = acpi_eval_integer(ad->ad_handle, "_BBN", &val);
 			if (ACPI_SUCCESS(rv))
 				ap->ap_bus = ACPI_LOWORD(val);
+		}
 		ap->ap_device = ACPI_HILODWORD(ad->ad_devinfo->Address);
 		ap->ap_function = ACPI_LOLODWORD(ad->ad_devinfo->Address);
 		if (ap->ap_bus > 255 || ap->ap_device > 31 ||
 		    ap->ap_function > 7) {
 			aprint_error_dev(ad->ad_root,
 			    "invalid PCI address for %s\n", ad->ad_name);
 			kmem_free(ap, sizeof(*ap));
 			goto rec;
+		}
 		ap->ap_bridge = true;
 		ap->ap_downbus = ap->ap_bus;
 		ad->ad_pciinfo = ap;
 		goto rec;
+	}
 	if ((ad->ad_parent != NULL) &&
 	    (ad->ad_parent->ad_pciinfo != NULL) &&
 	    (ad->ad_parent->ad_pciinfo->ap_bridge)) {
 		/*
 @@ -218,26 +226,33 @@ acpi_pcidev_scan(struct acpi_devnode *ad
 		 * our bus number is its downstream bus number.
 		 */
 		ap = kmem_zalloc(sizeof(*ap), KM_SLEEP);
 		if (ap == NULL)
 			return AE_NO_MEMORY;
 		ap->ap_segment = ad->ad_parent->ad_pciinfo->ap_segment;
 		ap->ap_bus = ad->ad_parent->ad_pciinfo->ap_downbus;
 		ap->ap_device = ACPI_HILODWORD(ad->ad_devinfo->Address);
 		ap->ap_function = ACPI_LOLODWORD(ad->ad_devinfo->Address);
 		if (ap->ap_device > 31 || ap->ap_function > 7) {
 			aprint_error_dev(ad->ad_root,
 			    "invalid PCI address for %s\n", ad->ad_name);
 			kmem_free(ap, sizeof(*ap));
 			goto rec;
+		}
 		/*
 		 * Check whether this device is a PCI-to-PCI
 		 * bridge and get its secondary bus number.
 		 */
 		rv = acpi_pcidev_ppb_downbus(ap->ap_segment, ap->ap_bus,
 		    ap->ap_device, ap->ap_function, &ap->ap_downbus);
 		ap->ap_bridge = (rv != AE_OK) ? false : true;
 		ad->ad_pciinfo = ap;
 		goto rec;
+	}
 @@ -246,28 +261,28 @@ rec:
 		rv = acpi_pcidev_scan(child);
 		if (ACPI_FAILURE(rv))
 			return rv;
+	}
 	return AE_OK;
+}
 /*
  * acpi_pcidev_ppb_downbus:
+ *
  *	Retrieve the secondary bus number of the PCI-to-PCI bridge having the
- *	given PCI id.  If successful, return AE_OK and fill *busp.  Otherwise,
+ *	given PCI id.  If successful, return AE_OK and fill *downbus.
- *	return an exception code and leave *busp unchanged.
+ *	Otherwise, return an exception code and leave *downbus unchanged.
+ *
  * XXX	Need to deal with PCI segment groups (see also acpica/OsdHardware.c).
  */
 ACPI_STATUS
 acpi_pcidev_ppb_downbus(uint16_t segment, uint16_t bus, uint16_t device,
     uint16_t function, uint16_t *downbus)
+{
 	struct acpi_softc *sc = acpi_softc;
 	pci_chipset_tag_t pc;
 	pcitag_t tag;
 	pcireg_t val;
 	if (bus > 255 || device > 31 || function > 7)