 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_pci_link.c,v 1.17 2010/04/14 19:27:28 jruoho Exp $	*/
+/*	$NetBSD: acpi_pci_link.c,v 1.18 2010/04/23 15:52:26 jruoho Exp $	*/
 /*-
  * Copyright (c) 2002 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
  * 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.
 @@ -17,45 +17,46 @@
  * 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_pci_link.c,v 1.17 2010/04/14 19:27:28 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.18 2010/04/23 15:52:26 jruoho Exp $");
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/pci/pcireg.h>
 #include "opt_acpi.h"
 #define _COMPONENT          ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME            ("acpi_pci_link")
 MALLOC_DECLARE(M_ACPI);
 #define NUM_ISA_INTERRUPTS	16
 #define NUM_ACPI_INTERRUPTS	256
 #define PCI_INVALID_IRQ	255
 #define PCI_INTERRUPT_VALID(x) ((x) != PCI_INVALID_IRQ && (x) != 0)
 #define ACPI_SERIAL_BEGIN(x)
 #define ACPI_SERIAL_END(x)
 /*
  * An ACPI PCI link device may contain multiple links.  Each link has its
  * own ACPI resource.  _PRT entries specify which link is being used via
 @@ -122,28 +123,26 @@ struct link {
 struct link_count_request {
 	int	in_dpf;
 	int	count;
 };
 struct link_res_request {
 	struct acpi_pci_link_softc *sc;
 	int	in_dpf;
 	int	res_index;
 	int	link_index;
 };
 MALLOC_DEFINE(M_PCI_LINK, "pci_link", "ACPI PCI Link structures");
 static int pci_link_interrupt_weights[NUM_ACPI_INTERRUPTS];
 static int pci_link_bios_isa_irqs;
 static ACPI_STATUS acpi_count_irq_resources(ACPI_RESOURCE *, void *);
 static ACPI_STATUS link_add_crs(ACPI_RESOURCE *, void *);
 static ACPI_STATUS link_add_prs(ACPI_RESOURCE *, void *);
 static int link_valid_irq(struct link *, int);
 static void acpi_pci_link_dump(struct acpi_pci_link_softc *);
 static int acpi_pci_link_attach(struct acpi_pci_link_softc *);
 static uint8_t acpi_pci_link_search_irq(struct acpi_pci_link_softc *, int, int,
 					int);
 static struct link *acpi_pci_link_lookup(struct acpi_pci_link_softc *, int);
 static ACPI_STATUS acpi_pci_link_srs(struct acpi_pci_link_softc *,
 @@ -333,27 +332,27 @@ link_add_prs(ACPI_RESOURCE *res, void *c
 			link->l_pol = res->Data.Irq.Polarity;
 			irqs = res->Data.Irq.Interrupts;
+		}
 		if (link->l_num_irqs == 0)
 			break;
 		/*
 		 * Save a list of the valid IRQs.  Also, if all of the
 		 * valid IRQs are ISA IRQs, then mark this link as
 		 * routed via an ISA interrupt.
 		 */
 		link->l_isa_irq = TRUE;
 		link->l_irqs = malloc(sizeof(int) * link->l_num_irqs,
-		    M_PCI_LINK, M_WAITOK | M_ZERO);
+		    M_ACPI, M_WAITOK | M_ZERO);
 		for (i = 0; i < link->l_num_irqs; i++) {
 			if (is_ext_irq) {
 				link->l_irqs[i] = ext_irqs[i];
 				if (ext_irqs[i] >= NUM_ISA_INTERRUPTS)
 					link->l_isa_irq = FALSE;
 			} else {
 				link->l_irqs[i] = irqs[i];
 				if (irqs[i] >= NUM_ISA_INTERRUPTS)
 					link->l_isa_irq = FALSE;
+			}
+		}
 		break;
 	default:
 @@ -453,27 +452,27 @@ acpi_pci_link_attach(struct acpi_pci_lin
 		if (ACPI_FAILURE(status)) {
 			aprint_error("%s: Unable to parse _CRS or _PRS: %s\n",
 			    sc->pl_name, AcpiFormatException(status));
 			ACPI_SERIAL_END(pci_link);
 			return (ENXIO);
+		}
+	}
 	sc->pl_num_links = creq.count;
 	if (creq.count == 0) {
 		ACPI_SERIAL_END(pci_link);
 		return (0);
+	}
 	sc->pl_links = malloc(sizeof(struct link) * sc->pl_num_links,
-	    M_PCI_LINK, M_WAITOK | M_ZERO);
+	    M_ACPI, M_WAITOK | M_ZERO);
 	/* Initialize the child links. */
 	for (i = 0; i < sc->pl_num_links; i++) {
 		sc->pl_links[i].l_irq = PCI_INVALID_IRQ;
 		sc->pl_links[i].l_bios_irq = PCI_INVALID_IRQ;
 		sc->pl_links[i].l_sc = sc;
 		sc->pl_links[i].l_isa_irq = FALSE;
 		sc->pl_links[i].l_res_index = -1;
 		sc->pl_links[i].l_dev_count = 0;
 		sc->pl_links[i].l_devices = NULL;
+	}
 	/* Try to read the current settings from _CRS if it is valid. */
 @@ -544,31 +543,31 @@ acpi_pci_link_attach(struct acpi_pci_lin
 		for (i = 0; i < sc->pl_num_links; i++)
 			if (PCI_INTERRUPT_VALID(sc->pl_links[i].l_irq))
 				sc->pl_links[i].l_routed = TRUE;
 	if (boothowto & AB_VERBOSE) {
 		printf("%s: Links after disable:\n", sc->pl_name);
 		acpi_pci_link_dump(sc);
+	}
 	ACPI_SERIAL_END(pci_link);
 	return (0);
 fail:
 	ACPI_SERIAL_END(pci_link);
 	for (i = 0; i < sc->pl_num_links; i++) {
 		if (sc->pl_links[i].l_irqs != NULL)
-			free(sc->pl_links[i].l_irqs, M_PCI_LINK);
+			free(sc->pl_links[i].l_irqs, M_ACPI);
 		if (sc->pl_links[i].l_devices != NULL)
-			free(sc->pl_links[i].l_devices, M_PCI_LINK);
+			free(sc->pl_links[i].l_devices, M_ACPI);
+	}
-	free(sc->pl_links, M_PCI_LINK);
+	free(sc->pl_links, M_ACPI);
 	return (ENXIO);
+}
 static void
 acpi_pci_link_add_functions(struct acpi_pci_link_softc *sc, struct link *link,
     int bus, int device, int pin)
+{
 	uint32_t value;
 	uint8_t func, maxfunc, ipin;
 	pcitag_t tag;
 	tag = pci_make_tag(acpi_softc->sc_pc, bus, device, 0);
 	/* See if we have a valid device at function 0. */
 @@ -589,27 +588,27 @@ acpi_pci_link_add_functions(struct acpi_
 		value = pci_conf_read(acpi_softc->sc_pc, tag,
 		    PCI_INTERRUPT_REG);
 		ipin = PCI_INTERRUPT_PIN(value);
 		/*
 		 * See if it uses the pin in question.  Note that the passed
 		 * in pin uses 0 for A, .. 3 for D whereas the intpin
 		 * register uses 0 for no interrupt, 1 for A, .. 4 for D.
 		 */
 		if (ipin != pin + 1)
 			continue;
 		link->l_devices = realloc(link->l_devices,
 		    sizeof(pcitag_t) * (link->l_dev_count + 1),
-		    M_PCI_LINK, M_WAITOK);
+		    M_ACPI, M_WAITOK);
 		link->l_devices[link->l_dev_count] = tag;
 		++link->l_dev_count;
+	}
+}
 static uint8_t
 acpi_pci_link_search_irq(struct acpi_pci_link_softc *sc, int bus, int device,
 			 int pin)
+{
 	uint32_t value;
 	uint8_t func, maxfunc, ipin, iline;
 	pcitag_t tag;
 @@ -1134,30 +1133,30 @@ acpi_pci_link_init(struct acpi_pci_link_
 		snprintf(sc->pl_name, sizeof (sc->pl_name), "%s",
 		    "ACPI link device");
 	acpi_pci_link_attach(sc);
+}
 void *
 acpi_pci_link_devbyhandle(ACPI_HANDLE handle)
+{
 	struct acpi_pci_link_softc *sc;
 	TAILQ_FOREACH(sc, &acpi_pci_linkdevs, pl_list) {
 		if (sc->pl_handle == handle)
 			return sc;
+	}
-	sc = malloc(sizeof (*sc), M_PCI_LINK, M_NOWAIT|M_ZERO);
+	sc = malloc(sizeof (*sc), M_ACPI, M_NOWAIT | M_ZERO);
 	if (sc == NULL)
 		return NULL;
 	sc->pl_handle = handle;
 	acpi_pci_link_init(sc);
 	TAILQ_INSERT_TAIL(&acpi_pci_linkdevs, sc, pl_list);
 	return (void *)sc;
+}
 void