pchb support

5 files changed, 246 insertions, 8 deletions

diff --git a/sys/arch/i386/conf/BABY b/sys/arch/i386/conf/BABY
index 3facf7c7623..54fa18a190f 100644
--- a/sys/arch/i386/conf/BABY
+++ b/sys/arch/i386/conf/BABY
@@ -1,4 +1,4 @@
-#	$OpenBSD: BABY,v 1.29 1998/01/04 12:20:29 deraadt Exp $
+#	$OpenBSD: BABY,v 1.30 1998/01/06 02:35:18 deraadt Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -89,13 +89,15 @@ option	APM_NOIDLE
 
 isa0	at mainbus0
 eisa0	at mainbus0
-pci0	at mainbus0 bus ?
+pci*	at mainbus0 bus ?
 
 option		PCIVERBOSE
 option		EISAVERBOSE
 
-ppb*	at pci? dev ? function ?	# PCI-PCI bridges
+pchb*	at pci? dev ? function ?	# PCI-Host bridges
+eppb*	at pci? dev ? function ?	# PCI-PCI bridges
 pci*	at ppb? bus ?
+pci*	at pchb? bus ?
 
 pcicmaster0	at isa? port 0x3E0 size 2
 pcic0	at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e8df0a6cf4a..3cb01c4d356 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.59 1997/12/26 08:17:14 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.60 1998/01/06 02:35:18 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -41,13 +41,15 @@ apm0	at bios0
 option	APM_NOIDLE
 isa0	at mainbus0
 eisa0	at mainbus0
-pci0	at mainbus0 bus ?
+pci*	at mainbus0 bus ?
 
 option		PCIVERBOSE
 option		EISAVERBOSE
 
+pchb*	at pci? dev ? function ?	# PCI-Host bridges
 ppb*	at pci? dev ? function ?	# PCI-PCI bridges
 pci*	at ppb? bus ?
+pci*	at pchb? bus ?
 
 pcicmaster0	at isa? port 0x3E0 size 2
 pcic0	at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 44565758714..f528cc2a7e2 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.24 1997/12/26 08:16:48 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.25 1998/01/06 02:35:19 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -57,13 +57,15 @@ option	APM_NOIDLE
 option	APMDEBUG
 isa0	at mainbus0
 eisa0	at mainbus0
-pci0	at mainbus0
+pci*	at mainbus0
 
 option		PCIVERBOSE
 option		EISAVERBOSE
 
+pchb*	at pci? dev ? function ?	# PCI-Host bridges
 ppb*	at pci? dev ? function ?	# PCI-PCI bridges
 pci*	at ppb? bus ?
+pci*	at pchb? bus ?
 
 pcicmaster0 at isa? port 0x3E0 size 2
 pcic0	at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index bf1f4b3cf1f..31a2caa0336 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.38 1997/12/21 14:47:15 downsj Exp $
+#	$OpenBSD: files.i386,v 1.39 1998/01/06 02:35:19 deraadt Exp $
 #	$NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
 #
 # new style config file for i386 architecture
@@ -81,6 +81,11 @@ include "../../../dev/pci/files.pci"
 file	arch/i386/pci/pci_machdep.c	pci
 file	arch/i386/pci/pci_compat.c	pci	# XXX compatibility
 
+# PCI-Host bridge chipsets
+device	pchb:	pcibus
+attach	pchb at pci
+file	arch/i386/pci/pchb.c		pchb
+
 #
 # Pcmcia, before ISA (to define device stuff)
 #
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
new file mode 100644
index 00000000000..4c39c084ee2
--- /dev/null
+++ b/sys/arch/i386/pci/pchb.c
@@ -0,0 +1,227 @@
+/*	$NetBSD: pchb.c,v 1.9 1997/10/09 08:48:33 jtc Exp $	*/
+
+/*-
+ * Copyright (c) 1996 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION 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/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+
+#include <machine/bus.h>
+
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+
+#include <dev/pci/pcidevs.h>
+
+#define PCISET_BRIDGETYPE_MASK	0x3
+#define PCISET_TYPE_COMPAT	0x1
+#define PCISET_TYPE_AUX		0x2
+
+#define PCISET_BUSCONFIG_REG	0x48
+#define PCISET_BRIDGE_NUMBER(reg)	(((reg) >> 8) & 0xff)
+#define PCISET_PCI_BUS_NUMBER(reg)	(((reg) >> 16) & 0xff)
+
+int	pchbmatch __P((struct device *, void *, void *));
+void	pchbattach __P((struct device *, struct device *, void *));
+
+int	pchb_print __P((void *, const char *));
+
+struct cfattach pchb_ca = {
+	sizeof(struct device), pchbmatch, pchbattach
+};
+
+struct cfdriver pchb_cd = {
+	NULL, "pchb", DV_DULL
+};
+
+int
+pchbmatch(parent, match, aux)
+	struct device *parent;
+	void *match, *aux;
+{
+	struct pci_attach_args *pa = aux;
+
+	/*
+	 * Match all known PCI host chipsets.
+	 */
+	switch (PCI_VENDOR(pa->pa_id)) {
+	case PCI_VENDOR_INTEL:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_INTEL_CDC:
+		case PCI_PRODUCT_INTEL_PCMC:
+		case PCI_PRODUCT_INTEL_82437FX:
+		case PCI_PRODUCT_INTEL_82437MX:
+		case PCI_PRODUCT_INTEL_82437VX:
+		case PCI_PRODUCT_INTEL_82439HX:
+		case PCI_PRODUCT_INTEL_82439TX:
+		case PCI_PRODUCT_INTEL_82441FX:
+		case PCI_PRODUCT_INTEL_82443LX:
+		case PCI_PRODUCT_INTEL_PCI450_PB:
+		case PCI_PRODUCT_INTEL_PCI450_MC:
+			return (1);
+		}
+		break;
+	case PCI_VENDOR_UMC:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_UMC_UM8881F:
+		case PCI_PRODUCT_UMC_UM8891N:
+			return (1);
+		}
+		break;
+	case PCI_VENDOR_ACC:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_ACC_2188:
+			return (1);
+		}
+		break;
+	case PCI_VENDOR_ACER:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_ACER_M1435:
+			return (1);
+		}
+		break;
+	case PCI_VENDOR_ALI:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_ALI_M1445:
+		case PCI_PRODUCT_ALI_M1451:
+		case PCI_PRODUCT_ALI_M1461:
+			return (1);
+		}
+		break;
+	case PCI_VENDOR_COMPAQ:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_COMPAQ_TRIFLEX1:
+		case PCI_PRODUCT_COMPAQ_TRIFLEX2:
+		case PCI_PRODUCT_COMPAQ_TRIFLEX4:
+			return (1);
+		}
+		break;
+	case PCI_VENDOR_NEXGEN:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_NEXGEN_NX82C501:
+			return (1);
+		}
+		break;
+	case PCI_VENDOR_NKK:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_NKK_NDR4600:
+			return (1);
+		}
+		break;
+	case PCI_VENDOR_TOSHIBA:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_TOSHIBA_R4X00:
+			return (1);
+		}
+		break;
+	case PCI_VENDOR_VIATECH:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_VIATECH_VT82C570M:
+		case PCI_PRODUCT_VIATECH_VT82C595:
+			return (1);
+		}
+		break;
+	}
+
+	return (0);
+}
+
+void
+pchbattach(parent, self, aux)
+	struct device *parent, *self;
+	void *aux;
+{
+	struct pci_attach_args *pa = aux;
+	struct pcibus_attach_args pba;
+	pcireg_t bcreg;
+	u_char bdnum, pbnum;
+
+	/*
+	 * Print out a description, and configure certain chipsets which
+	 * have auxiliary PCI buses.
+	 */
+
+	switch (PCI_VENDOR(pa->pa_id)) {
+	case PCI_VENDOR_INTEL:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_INTEL_PCI450_PB:
+			bcreg = pci_conf_read(pa->pa_pc, pa->pa_tag,
+					      PCISET_BUSCONFIG_REG);
+			bdnum = PCISET_BRIDGE_NUMBER(bcreg);
+			pbnum = PCISET_PCI_BUS_NUMBER(bcreg);
+			switch (bdnum & PCISET_BRIDGETYPE_MASK) {
+			default:
+				printf(", bdnum=%x (reserved)\n", bdnum);
+				break;
+			case PCISET_TYPE_COMPAT:
+				printf(", Compatibility PB (bus %d)\n", pbnum);
+				break;
+			case PCISET_TYPE_AUX:
+				printf(", Auxiliary PB (bus %d)\n", pbnum);
+				/*
+				 * This host bridge has a second PCI bus.
+				 * Configure it.
+				 */
+				pba.pba_busname = "pci";
+				pba.pba_iot = pa->pa_iot;
+				pba.pba_memt = pa->pa_memt;
+				pba.pba_bus = pbnum;
+				pba.pba_pc = pa->pa_pc;
+				config_found(self, &pba, pchb_print);
+				break;
+			}
+			break;
+		default:
+			printf("\n");
+			break;
+		}
+	}
+}
+
+int
+pchb_print(aux, pnp)
+	void *aux;
+	const char *pnp;
+{
+	struct pcibus_attach_args *pba = aux;
+
+	if (pnp)
+		printf("%s at %s", pba->pba_busname, pnp);
+	printf(" bus %d", pba->pba_bus);
+	return (UNCONF);
+}