 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_machdep.c,v 1.63 2013/12/25 17:24:39 jakllsch Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.64 2014/01/26 10:54:24 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -63,27 +63,27 @@
 /*
  * Machine-specific functions for PCI autoconfiguration.
+ *
  * On PCs, there are two methods of generating PCI configuration cycles.
  * We try to detect the appropriate mechanism for this machine and set
  * up a few function pointers to access the correct method directly.
+ *
  * The configuration method can be hard-coded in the config file by
  * using `options PCI_CONF_MODE=N', where `N' is the configuration mode
  * as defined in section 3.6.4.1, `Generating Configuration Cycles'.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.63 2013/12/25 17:24:39 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.64 2014/01/26 10:54:24 msaitoh Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/kmem.h>
 #include <uvm/uvm_extern.h>
 @@ -100,26 +100,27 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/genfb_pcivar.h>
 #include <dev/wsfb/genfbvar.h>
 #include <arch/x86/include/genfb_machdep.h>
 #include <dev/ic/vgareg.h>
 #include "acpica.h"
 #include "genfb.h"
 #include "isa.h"
 #include "opt_acpi.h"
 #include "opt_ddb.h"
 #include "opt_mpbios.h"
 #include "opt_puc.h"
 #include "opt_vga.h"
 #include "pci.h"
 #include "wsdisplay.h"
 #include "com.h"
 #ifdef DDB
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 #endif
 #ifdef VGA_POST
 #include <x86/vga_post.h>
 @@ -953,24 +954,31 @@ device_pci_register(device_t dev, void *
 			prop_dictionary_set_uint64(dict,
 			    "pmf_callback", (uint64_t)(uintptr_t)&pmf_cb);
 #ifdef VGA_POST
 			vga_posth = vga_post_init(pa->pa_bus, pa->pa_device,
 			    pa->pa_function);
 #endif
 			found_console = true;
 			return NULL;
+		}
+	}
 	return NULL;
+}
 #ifndef PUC_CNBUS
 #define PUC_CNBUS 0
 #endif
 #if NCOM > 0
 int
-cpu_comcnprobe(struct consdev *cn, struct pci_attach_args *pa)
+cpu_puc_cnprobe(struct consdev *cn, struct pci_attach_args *pa)
+{
 	pci_mode_detect();
 	pa->pa_iot = x86_bus_space_io;
 	pa->pa_memt = x86_bus_space_mem;
 	pa->pa_pc = 0;
-	pa->pa_tag = pci_make_tag(0, 0, pci_bus_maxdevs(NULL, 0) - 1, 0);
+	pa->pa_tag = pci_make_tag(0, PUC_CNBUS, pci_bus_maxdevs(NULL, 0) - 1,
 );
 	return 0;
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: consinit.c,v 1.24 2012/10/13 17:58:55 jdc Exp $	*/
+/*	$NetBSD: consinit.c,v 1.25 2014/01/26 10:54:24 msaitoh Exp $	*/
 /*
  * Copyright (c) 1998
  *	Matthias Drochner.  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,41 +17,43 @@
  * 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: consinit.c,v 1.24 2012/10/13 17:58:55 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.25 2014/01/26 10:54:24 msaitoh Exp $");
 #include "opt_kgdb.h"
 #include "opt_puc.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <machine/bootinfo.h>
 #include <arch/x86/include/genfb_machdep.h>
 #include "genfb.h"
 #include "vga.h"
 #include "ega.h"
 #include "pcdisplay.h"
 #include "com_puc.h"
 #if (NVGA > 0) || (NEGA > 0) || (NPCDISPLAY > 0)
 #include <dev/ic/mc6845reg.h>
 #include <dev/ic/pcdisplayvar.h>
 #if (NVGA > 0)
 #include <dev/ic/vgareg.h>
 #include <dev/ic/vgavar.h>
 #endif
 #if (NEGA > 0)
 #include <dev/isa/egavar.h>
 #endif
 #if (NPCDISPLAY > 0)
 #include <dev/isa/pcdisplayvar.h>
 #endif
 @@ -66,26 +68,29 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
 #endif
 #include "pckbd.h" /* for pckbc_machdep_cnattach */
 #if (NGENFB > 0)
 #include <dev/wsfb/genfbvar.h>
 #endif
 #include "com.h"
 #if (NCOM > 0)
 #include <sys/termios.h>
 #include <dev/ic/comreg.h>
 #include <dev/ic/comvar.h>
 #endif
 #if (NCOM_PUC > 0)
 #include <dev/pci/puccn.h>
 #endif
 #include "ukbd.h"
 #if (NUKBD > 0)
 #include <dev/usb/ukbdvar.h>
 #endif
 #ifndef CONSDEVNAME
 #define CONSDEVNAME "pc"
 #endif
 #if (NCOM > 0)
 #ifndef CONADDR
 #define CONADDR 0x3f8
 @@ -134,26 +139,27 @@ int comkgdbmode = KGDB_DEVMODE;
 /*
  * consinit:
  * initialize the system console.
  * XXX - shouldn't deal with this initted thing, but then,
  * it shouldn't be called from init386 either.
  */
 void
 consinit(void)
+{
 	const struct btinfo_console *consinfo;
 	const struct btinfo_framebuffer *fbinfo;
 	static int initted;
 	int rv;
 	if (initted)
 		return;
 	initted = 1;
 #ifndef CONS_OVERRIDE
 	consinfo = lookup_bootinfo(BTINFO_CONSOLE);
 	if (!consinfo)
 #endif
 		consinfo = &default_consinfo;
 	fbinfo = lookup_bootinfo(BTINFO_FRAMEBUFFER);
 @@ -194,35 +200,42 @@ dokbd:
 		if (error)
 			error = ukbd_cnattach();
 #endif
 		if (error)
 			printf("WARNING: no console keyboard, error=%d\n",
 			       error);
 		return;
+	}
 #if (NCOM > 0)
 	if (!strcmp(consinfo->devname, "com")) {
 		int addr = consinfo->addr;
 		int speed = consinfo->speed;
 #if (NCOM_PUC > 0) && defined(PUC_CNAUTO)
 		puc_cnprobe(NULL);
 		rv = puc_cninit(NULL);
 		if (rv == 0)
 			return;
 #endif
 		if (addr == 0)
 			addr = CONADDR;
 		if (speed == 0)
 			speed = CONSPEED;
-		if (comcnattach(x86_bus_space_io, addr, speed,
+		rv = comcnattach(x86_bus_space_io, addr, speed,
-				COM_FREQ, COM_TYPE_NORMAL, comcnmode))
+				 COM_FREQ, COM_TYPE_NORMAL, comcnmode);
 		if (rv != 0)
 			panic("can't init serial console @%x", consinfo->addr);
 		return;
+	}
 #endif
 	panic("invalid console device %s", consinfo->devname);
+}
 #ifdef KGDB
 void
 kgdb_port_init(void)
+{
 #if (NCOM > 0)
 	if(!strcmp(kgdb_devname, "com")) {
 		com_kgdb_attach(x86_bus_space_io, comkgdbaddr, comkgdbrate,

 @@ -1,14 +1,14 @@
-#	$NetBSD: files.pci,v 1.368 2014/01/21 14:52:07 mlelstv Exp $
+#	$NetBSD: files.pci,v 1.369 2014/01/26 10:54:24 msaitoh Exp $
+#
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
 # defined first.
 defflag	opt_pci.h	PCIVERBOSE PCI_CONFIG_DUMP PCI_NETBSD_CONFIGURE
 defparam opt_pci.h	PCI_NETBSD_ENABLE_IDE
 defflag	opt_bktr.h	BKTR_430_FX_MODE BKTR_GPIO_ACCESS BKTR_NO_MSP_RESET
 			BKTR_REVERSE_MUTE BKTR_SIS_VIA_MODE BKTR_USE_PLL
 defparam opt_bktr.h	BKTR_OVERRIDE_CARD BKTR_OVERRIDE_TUNER BKTR_OVERRIDE_DBX
 			BKTR_OVERRIDE_MSP BKTR_SYSTEM_DEFAULT
 @@ -594,29 +594,31 @@ device	autri: audiobus, auconv, mulaw, a
 attach	autri at pci
 file	dev/pci/autri.c			autri
 # SMC EPIC/100 Fast Ethernet on PCI
 attach	epic at pci with epic_pci
 file	dev/pci/if_epic_pci.c		epic_pci
 # PCI "universal" communication device driver, for PCI com, lpt, etc. ports
 # (see documentation in the driver for what, exactly, should be supported)
 device	puc { port = -1 }
 attach	puc at pci
 file	dev/pci/puc.c			puc
 file	dev/pci/pucdata.c		puc
 defflag opt_puc.h	PUC_CNAUTO
 defparam opt_puc.h	PUC_CNBUS
 attach	com at puc with com_puc
-file	dev/pci/com_puc.c		com_puc
+file	dev/pci/com_puc.c		com_puc needs-flag
 file	dev/pci/cyber.c			com_puc
 file	dev/pci/puccn.c			com_puc
 attach	lpt at puc with lpt_puc
 file	dev/pci/lpt_puc.c		lpt_puc & !ppbus
 attach	atppc at puc with atppc_puc
 file	dev/pci/atppc_puc.c		atppc_puc
 # UHCI USB controller
 attach	uhci at pci with uhci_pci
 file	dev/pci/uhci_pci.c		uhci_pci

 @@ -1,14 +1,14 @@
-/*	$NetBSD: puccn.c,v 1.12 2014/01/23 17:43:28 msaitoh Exp $ */
+/*	$NetBSD: puccn.c,v 1.13 2014/01/26 10:54:24 msaitoh Exp $ */
 /*
  * Derived from  pci.c
  * Copyright (c) 2000 Geocast Networks Systems.  All rights reserved.
+ *
  * Copyright (c) 1995, 1996, 1997, 1998
  *     Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 Charles M. Hannum.  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
 @@ -32,27 +32,27 @@
  * 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 independent support for PCI serial console support.
+ *
  * Scan the PCI bus for something which resembles a 16550
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puccn.c,v 1.12 2014/01/23 17:43:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puccn.c,v 1.13 2014/01/26 10:54:24 msaitoh Exp $");
 #include "opt_kgdb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <sys/termios.h>
 @@ -65,55 +65,55 @@ __KERNEL_RCSID(0, "$NetBSD: puccn.c,v 1.
 #include <dev/pci/puccn.h>
 #ifndef CONSPEED
 #define CONSPEED	TTYDEF_SPEED
 #endif
 #ifndef CONMODE
 #define	CONMODE		((TTYDEF_CFLAG & ~(CSIZE|CSTOPB|PARENB))|CS8) /* 8N1 */
 #endif
 cons_decl(com);
 static bus_addr_t puccnbase;
 static bus_space_tag_t puctag;
 static int puccnflags;
 #ifdef KGDB
 static bus_addr_t pucgdbbase;
 #endif
 /*
  * Static dev/func variables allow pucprobe to be called multiple times,
  * resuming the search where it left off, never retrying the same adaptor.
  */
 static bus_addr_t
 pucprobe_doit(struct consdev *cn)
+{
 	struct pci_attach_args pa;
 	int bus;
 	static int dev = 0, func = 0;
 	int maxdev, nfunctions = 0, i; /* XXX */
 	pcireg_t reg, bhlcr, subsys = 0; /* XXX */
 	int foundport = 0;
 	const struct puc_device_description *desc;
 	pcireg_t base;
 	/* Fetch our tags */
 #if defined(amd64) || defined(i386)
-	if (cpu_comcnprobe(cn, &pa) != 0)
+	if (cpu_puc_cnprobe(cn, &pa) != 0)
 #endif
 		return 0;
 	puctag = pa.pa_iot;
 	pci_decompose_tag(pa.pa_pc, pa.pa_tag, &bus, &maxdev, NULL);
 	/* Scan through devices and find a communication class device. */
 	for (; dev <= maxdev ; dev++) {
 		pa.pa_tag = pci_make_tag(pa.pa_pc, bus, dev, 0);
 		reg = pci_conf_read(pa.pa_pc, pa.pa_tag, PCI_ID_REG);
 		if (PCI_VENDOR(reg) == PCI_VENDOR_INVALID
 		    || PCI_VENDOR(reg) == 0)
 			continue;
 		bhlcr = pci_conf_read(pa.pa_pc, pa.pa_tag, PCI_BHLC_REG);
 		if (PCI_HDRTYPE_MULTIFN(bhlcr)) {
 			nfunctions = 8;
 		} else {
 @@ -135,96 +135,114 @@ resume_scan:
+		}
 		if (foundport)
 			break;
 		func = 0;
+	}
 	/*
 	 * If all devices was scanned and couldn't find any communication
 	 * device, return with 0.
 	 */
 	if (!foundport)
 		return 0;
 	/* Clear foundport flag */
 	foundport = 0;
 	/* Check whether the device is in the puc device table or not */
 	desc = puc_find_description(PCI_VENDOR(pa.pa_id),
 	    PCI_PRODUCT(pa.pa_id), PCI_VENDOR(subsys), PCI_PRODUCT(subsys));
 	/* If not, check the next communication device */
 	if (desc == NULL) {
 		/* Resume from the next function */
 		func++;
 		goto resume_scan;
+	}
 	/*
 	 * We found a device and it's on the puc table. Set the tag and
 	 * the base address.
 	 */
 	for (i = 0; PUC_PORT_VALID(desc, i); i++)
+	{
 		if (desc->ports[i].type != PUC_PORT_TYPE_COM)
 			continue;
 		puccnflags = desc->ports[i].flags;
 		base = pci_conf_read(pa.pa_pc, pa.pa_tag, desc->ports[i].bar);
 		base += desc->ports[i].offset;
-		if (PCI_MAPREG_TYPE(base) != PCI_MAPREG_TYPE_IO)
+		if (PCI_MAPREG_TYPE(base) == PCI_MAPREG_TYPE_IO) {
-			continue;
+			puctag = pa.pa_iot;
-		base = PCI_MAPREG_IO_ADDR(base);
+			base = PCI_MAPREG_IO_ADDR(base);
+		}
 #if 0 /* For MMIO device */
 		else {
 			puctag = pa.pa_memt;
 			base = PCI_MAPREG_MEM_ADDR(base);
+		}
 #endif
 		if (com_is_console(puctag, base, NULL))
 			continue;
 		foundport = 1;
 		break;
+	}
 	if (foundport == 0) {
 		func++;
 		goto resume_scan;
+	}
 #if 0
 	cn->cn_pri = CN_REMOTE;
-	return PCI_MAPREG_IO_ADDR(base);
+#else
 	if (cn)
 		cn->cn_pri = CN_REMOTE;
 #endif
 	return base;
+}
 #ifdef KGDB
 void comgdbprobe(struct consdev *);
 void comgdbinit(struct consdev *);
 void
 comgdbprobe(struct consdev *cn)
+{
 	pucgdbbase = pucprobe_doit(cn);
+}
 void
 comgdbinit(struct consdev *cn)
+{
 	if (pucgdbbase == 0)
 		return;
 	com_kgdb_attach(puctag, pucgdbbase, CONSPEED, COM_FREQ,
 	    COM_TYPE_NORMAL, CONMODE);
+}
 #endif
 void
-comcnprobe(struct consdev *cn)
+puc_cnprobe(struct consdev *cn)
+{
 	puccnbase = pucprobe_doit(cn);
+}
-void
+int
-comcninit(struct consdev *cn)
+puc_cninit(struct consdev *cn)
+{
 	if (puccnbase == 0)
-		return;
+		return -1;
-	comcnattach(puctag, puccnbase, CONSPEED, COM_FREQ, COM_TYPE_NORMAL,
+	return comcnattach(puctag, puccnbase, CONSPEED,
 	    puccnflags & PUC_COM_CLOCKMASK, COM_TYPE_NORMAL,
 	    CONMODE);
+}
 /* comcngetc, comcnputc, comcnpollc provided by dev/ic/com.c */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: puccn.h,v 1.5 2013/07/22 13:40:36 soren Exp $ */
+/*	$NetBSD: puccn.h,v 1.6 2014/01/26 10:54:24 msaitoh Exp $ */
 /*
  * Derived from  pci.c
  * Copyright (c) 2000 Geocast Networks Systems.  All rights reserved.
+ *
  * Copyright (c) 1995, 1996, 1997, 1998
  *     Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 Charles M. Hannum.  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
 @@ -25,23 +25,26 @@
  * 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 <dev/cons.h>
 #include <dev/pci/pcivar.h>
 /*
  * Machine independent support for PCI serial console support.
+ *
  * Platform code should provide cpu_comcnprobe() that fills
  * in the pci_attach_args.  This allows the console can be
  * used before the normal PCI bus initialization.
  */
-int cpu_comcnprobe(struct consdev *, struct pci_attach_args *);
+void puc_cnprobe(struct consdev *);
 int puc_cninit(struct consdev *);
 int cpu_puc_cnprobe(struct consdev *, struct pci_attach_args *);