 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_addr_fixup.c,v 1.6 2011/07/01 18:22:08 dyoung Exp $	*/
+/*	$NetBSD: pci_addr_fixup.c,v 1.7 2011/08/28 05:32:41 dyoung Exp $	*/
 /*-
  * Copyright (c) 2000 UCHIYAMA Yasushi.  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.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -17,56 +17,52 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: pci_addr_fixup.c,v 1.6 2011/07/01 18:22:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.7 2011/08/28 05:32:41 dyoung Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/bus.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <x86/pci/pci_addr_fixup.h>
 struct pciaddr pciaddr;
-static int pciaddrverbose = 0;
+static void	pciaddr_resource_reserve(pci_chipset_tag_t, pcitag_t, void *);
 static int	pciaddr_do_resource_reserve(pci_chipset_tag_t, pcitag_t, int,
 void	pciaddr_resource_reserve(pci_chipset_tag_t, pcitag_t, void *context);
 int	pciaddr_do_resource_reserve(pci_chipset_tag_t, pcitag_t, int,
     				    void *, int, bus_addr_t *, bus_size_t);
-void	pciaddr_resource_allocate(pci_chipset_tag_t, pcitag_t, void *context);
+static void	pciaddr_resource_allocate(pci_chipset_tag_t, pcitag_t, void *);
-int	pciaddr_do_resource_allocate(pci_chipset_tag_t, pcitag_t, int,
+static int	pciaddr_do_resource_allocate(pci_chipset_tag_t, pcitag_t, int,
 				     void *, int, bus_addr_t *, bus_size_t);
-int	device_is_agp(pci_chipset_tag_t, pcitag_t);
+static int	device_is_agp(pci_chipset_tag_t, pcitag_t);
 int	device_is_agp(pci_chipset_tag_t, pcitag_t);
 #define PCIADDR_MEM_START	0x0
 #define PCIADDR_MEM_END		0xffffffff
 #define PCIADDR_PORT_START	0x0
 #define PCIADDR_PORT_END	0xffff
 /* for ISA devices */
 #define PCIADDR_ISAPORT_RESERVE	0x5800 /* empirical value */
 #define PCIADDR_ISAMEM_RESERVE	(16 * 1024 * 1024)
 void
 pci_addr_fixup(pci_chipset_tag_t pc, int maxbus)
+{
 @@ -137,72 +133,70 @@ pci_addr_fixup(pci_chipset_tag_t pc, int
 	if (pciaddr.nbogus == 0)
 		return; /* no need to fixup */
 	/*
 	 * 4. do fixup
 	 */
 	aprint_debug(verbose_header, "PCIBIOS fixup stage");
 	pciaddr.nbogus = 0;
 	pci_device_foreach_min(pc, 0, maxbus, pciaddr_resource_allocate, NULL);
 	aprint_debug(verbose_footer, pciaddr.nbogus);
+}
-void
+static void
 pciaddr_resource_reserve(pci_chipset_tag_t pc, pcitag_t tag,
     void *context)
+{
 	if (pciaddrverbose)
 		pciaddr_print_devid(pc, tag);
 	pciaddr_resource_manage(pc, tag,
 				pciaddr_do_resource_reserve,
 				&pciaddr);
+}
-void
+static void
 pciaddr_resource_allocate(pci_chipset_tag_t pc, pcitag_t tag,
     void *context)
+{
 	if (pciaddrverbose)
 		pciaddr_print_devid(pc, tag);
 	pciaddr_resource_manage(pc, tag,
 				pciaddr_do_resource_allocate,
 				&pciaddr);
+}
 void
 pciaddr_resource_manage(pci_chipset_tag_t pc, pcitag_t tag,
     pciaddr_resource_manage_func_t func, void *ctx)
+{
 	pcireg_t val, mask;
 	bus_addr_t addr;
 	bus_size_t size;
 	int error, useport, usemem, mapreg, type, reg_start, reg_end, width;
 	val = pci_conf_read(pc, tag, PCI_BHLC_REG);
 	switch (PCI_HDRTYPE_TYPE(val)) {
 	default:
 		aprint_error("WARNING: unknown PCI device header.");
 		pciaddr.nbogus++;
 		return;
-	case 0:
+	case PCI_HDRTYPE_DEVICE:
 		reg_start = PCI_MAPREG_START;
 		reg_end   = PCI_MAPREG_END;
 		break;
-	case 1: /* PCI-PCI bridge */
+	case PCI_HDRTYPE_PPB: /* PCI-PCI bridge */
 		reg_start = PCI_MAPREG_START;
 		reg_end   = PCI_MAPREG_PPB_END;
 		break;
-	case 2: /* PCI-CardBus bridge */
+	case PCI_HDRTYPE_PCB: /* PCI-CardBus bridge */
 		reg_start = PCI_MAPREG_START;
 		reg_end   = PCI_MAPREG_PCB_END;
 		break;
+	}
 	error = useport = usemem = 0;
 	for (mapreg = reg_start; mapreg < reg_end; mapreg += width) {
 		/* inquire PCI device bus space requirement */
 		val = pci_conf_read(pc, tag, mapreg);
 		pci_conf_write(pc, tag, mapreg, ~0);
 		mask = pci_conf_read(pc, tag, mapreg);
 		pci_conf_write(pc, tag, mapreg, val);
 @@ -219,166 +213,162 @@ pciaddr_resource_manage(pci_chipset_tag_
 				 * XXX i386-land.
 				 * XXX So just arrange to not look at the
 				 * XXX upper 32 bits, lest we misinterpret
 				 * XXX it as a 32-bit BAR set to zero.
 				 */
 			    width = 8;
+			}
 			size = PCI_MAPREG_MEM_SIZE(mask);
 		} else {
 			size = PCI_MAPREG_IO_SIZE(mask);
+		}
 		addr = pciaddr_ioaddr(val);
-		if (!size) /* unused register */
+		if (size == 0) /* unused register */
 			continue;
 		if (type == PCI_MAPREG_TYPE_MEM)
 			++usemem;
 		else
 			++useport;
 		/* reservation/allocation phase */
 		error += (*func) (pc, tag, mapreg, ctx, type, &addr, size);
 		aprint_debug("\n\t%02xh %s 0x%08x 0x%08x",
 				mapreg, type ? "port" : "mem ",
 				(unsigned int)addr, (unsigned int)size);
+	}
 	/* enable/disable PCI device */
 	val = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG);
 	if (error == 0)
 		val |= (PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE |
 			PCI_COMMAND_MASTER_ENABLE);
 	else
 		val &= ~(PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE |
 			 PCI_COMMAND_MASTER_ENABLE);
 	pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG, val);
-	if (error)
+	if (error != 0)
 		pciaddr.nbogus++;
 	aprint_debug("\n\t\t[%s]\n", error ? "NG" : "OK");
+}
-int
+static int
 pciaddr_do_resource_allocate(pci_chipset_tag_t pc, pcitag_t tag,
     int mapreg, void *ctx, int type, bus_addr_t *addr, bus_size_t size)
+{
  	struct pciaddr *pciaddrmap = (struct pciaddr *)ctx;
 	bus_addr_t start;
 	int error;
  	struct extent *ex;
-	if (*addr) /* no need to allocate */
+	if (*addr != 0) /* no need to allocate */
-		return (0);
+		return 0;
  	ex = (type == PCI_MAPREG_TYPE_MEM ?
  	      pciaddrmap->extent_mem : pciaddrmap->extent_port);
 	/* XXX Don't allocate if device is AGP device to avoid conflict. */
 	if (device_is_agp(pc, tag))
-		return (0);
+		return 0;
 	start = (type == PCI_MAPREG_TYPE_MEM ?
 		 pciaddrmap->mem_alloc_start : pciaddrmap->port_alloc_start);
 	if (start < ex->ex_start || start + size - 1 >= ex->ex_end) {
 		aprint_debug("No available resources. fixup failed\n");
-		return (1);
+		return 1;
+	}
 	error = extent_alloc_subregion(ex, start, ex->ex_end, size,
 				       size, 0,
 				       EX_FAST|EX_NOWAIT|EX_MALLOCOK,
 				       (u_long *)addr);
 	if (error) {
 		aprint_debug("No available resources. fixup failed\n");
-		return (1);
+		return 1;
+	}
 	/* write new address to PCI device configuration header */
 	pci_conf_write(pc, tag, mapreg, *addr);
 	/* check */
-	if (!pciaddrverbose)
+	aprint_debug("pci_addr_fixup: ");
 		aprint_verbose("pci_addr_fixup: ");
 		pciaddr_print_devid(pc, tag);
 	if (pciaddr_ioaddr(pci_conf_read(pc, tag, mapreg)) != *addr) {
 		pci_conf_write(pc, tag, mapreg, 0); /* clear */
 		aprint_error("fixup failed. (new address=%#x)\n", (unsigned)*addr);
-		return (1);
+		return 1;
+	}
-	if (!pciaddrverbose)
+	aprint_debug("new address 0x%08x\n", (unsigned)*addr);
 		aprint_verbose("new address 0x%08x\n", (unsigned)*addr);
-	return (0);
+	return 0;
+}
 int
 pciaddr_do_resource_reserve(pci_chipset_tag_t pc, pcitag_t tag,
     int mapreg, void *ctx, int type, bus_addr_t *addr, bus_size_t size)
+{
 	struct extent *ex;
 	struct pciaddr *pciaddrmap = (struct pciaddr *)ctx;
 	int error;
 	if (*addr == 0)
-		return (1);
+		return 1;
 	ex = (type == PCI_MAPREG_TYPE_MEM ?
 	      pciaddrmap->extent_mem : pciaddrmap->extent_port);
 	error = extent_alloc_region(ex, *addr, size, EX_NOWAIT| EX_MALLOCOK);
 	if (error) {
 		aprint_debug("Resource conflict.\n");
 		pci_conf_write(pc, tag, mapreg, 0); /* clear */
-		return (1);
+		return 1;
+	}
-	return (0);
+	return 0;
+}
 bus_addr_t
 pciaddr_ioaddr(uint32_t val)
+{
-	return ((PCI_MAPREG_TYPE(val) == PCI_MAPREG_TYPE_MEM)
+	return (PCI_MAPREG_TYPE(val) == PCI_MAPREG_TYPE_MEM)
 		? PCI_MAPREG_MEM_ADDR(val)
-		: PCI_MAPREG_IO_ADDR(val));
+		: PCI_MAPREG_IO_ADDR(val);
+}
 void
 pciaddr_print_devid(pci_chipset_tag_t pc, pcitag_t tag)
+{
 	int bus, device, function;
 	pcireg_t id;
 	id = pci_conf_read(pc, tag, PCI_ID_REG);
 	pci_decompose_tag(pc, tag, &bus, &device, &function);
-	aprint_verbose("%03d:%02d:%d 0x%04x 0x%04x ", bus, device, function,
+	aprint_debug("%03d:%02d:%d 0x%04x 0x%04x ", bus, device, function,
 	       PCI_VENDOR(id), PCI_PRODUCT(id));
+}
-int
+static int
 device_is_agp(pci_chipset_tag_t pc, pcitag_t tag)
+{
 	pcireg_t class, status, rval;
 	int off;
 	/* Check AGP device. */
 	class = pci_conf_read(pc, tag, PCI_CLASS_REG);
 	if (PCI_CLASS(class) == PCI_CLASS_DISPLAY) {
 		status = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG);
 		if (status & PCI_STATUS_CAPLIST_SUPPORT) {
 			rval = pci_conf_read(pc, tag, PCI_CAPLISTPTR_REG);
 			for (off = PCI_CAPLIST_PTR(rval);
 			    off != 0;
 			    off = PCI_CAPLIST_NEXT(rval) ) {
 				rval = pci_conf_read(pc, tag, off);
 				if (PCI_CAPLIST_CAP(rval) == PCI_CAP_AGP)
-					return (1);
+					return 1;
+			}
+		}
+	}
-	return (0);
+	return 0;
+}