Extend xbridge to support shared interrupt handlers, and perform PCI-PCI

bridge initialization if necessary; enable ppb on IP27 and IP30 kernels.
With feedback from kettenis@; macepcibr to gain the same functionality soon.

5 files changed, 19 insertions, 5 deletions

diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27
index dc5322a7c4a..d32d0e8ae31 100644
--- a/sys/arch/sgi/conf/GENERIC-IP27
+++ b/sys/arch/sgi/conf/GENERIC-IP27
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP27,v 1.11 2009/06/24 17:27:40 miod Exp $
+#	$OpenBSD: GENERIC-IP27,v 1.12 2009/07/13 21:19:22 miod Exp $
 #
 # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
 #
@@ -127,6 +127,9 @@ video*		at uvideo?
 udl*		at uhub?
 wsdisplay*	at udl?
 
+ppb*		at pci?		# PCI-PCI bridges
+pci*		at ppb?
+
 #### NICs
 dc*		at pci?		# 21143, "tulip" clone ethernet
 bnx*		at pci?		# Broadcom BCM5706/5708 GigE
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30
index 0e0efc38955..305372b2c8a 100644
--- a/sys/arch/sgi/conf/GENERIC-IP30
+++ b/sys/arch/sgi/conf/GENERIC-IP30
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP30,v 1.9 2009/06/24 17:27:40 miod Exp $
+#	$OpenBSD: GENERIC-IP30,v 1.10 2009/07/13 21:19:22 miod Exp $
 #
 # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
 #
@@ -127,6 +127,9 @@ video*		at uvideo?
 udl*		at uhub?
 wsdisplay*	at udl?
 
+ppb*		at pci?		# PCI-PCI bridges
+pci*		at ppb?
+
 #### NICs
 dc*		at pci?		# 21143, "tulip" clone ethernet
 em*		at pci?		# Intel Pro/1000 ethernet
diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27
index 9f8f6bad256..744dd20b42e 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP27
+++ b/sys/arch/sgi/conf/RAMDISK-IP27
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP27,v 1.6 2009/06/24 17:27:40 miod Exp $
+#	$OpenBSD: RAMDISK-IP27,v 1.7 2009/07/13 21:19:22 miod Exp $
 #
 # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
 
@@ -121,6 +121,9 @@ wi*		at uhub?	# WaveLAN IEEE 802.11DS
 zyd*		at uhub?	# Zydas ZD1211
 ugen*		at uhub?	# USB Generic driver
 
+ppb*		at pci?		# PCI-PCI bridges
+pci*		at ppb?
+
 #### NICs
 dc*		at pci?		# 21143, "tulip" clone ethernet
 em*		at pci?		# Intel Pro/1000 ethernet
diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30
index 07453051054..e7a98107b95 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP30
+++ b/sys/arch/sgi/conf/RAMDISK-IP30
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP30,v 1.6 2009/06/24 17:27:40 miod Exp $
+#	$OpenBSD: RAMDISK-IP30,v 1.7 2009/07/13 21:19:22 miod Exp $
 #
 # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
 
@@ -122,6 +122,9 @@ wi*		at uhub?	# WaveLAN IEEE 802.11DS
 zyd*		at uhub?	# Zydas ZD1211
 ugen*		at uhub?	# USB Generic driver
 
+ppb*		at pci?		# PCI-PCI bridges
+pci*		at ppb?
+
 #### NICs
 dc*		at pci?		# 21143, "tulip" clone ethernet
 em*		at pci?		# Intel Pro/1000 ethernet
diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi
index 028cfc9ef39..2b8b33b347f 100644
--- a/sys/arch/sgi/conf/files.sgi
+++ b/sys/arch/sgi/conf/files.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sgi,v 1.27 2009/06/24 17:27:40 miod Exp $
+#	$OpenBSD: files.sgi,v 1.28 2009/07/13 21:19:22 miod Exp $
 #
 # maxpartitions must be first item in files.${ARCH}
 #
@@ -72,6 +72,7 @@ include "dev/onewire/files.onewire"
 #
 #	PCI Bus bridges
 #
+
 device	macepcibr {} : pcibus
 attach	macepcibr at macebus
 file	arch/sgi/pci/macepcibridge.c		macepcibr needs-flag
@@ -89,6 +90,7 @@ include	"dev/i2o/files.i2o"
 #
 
 include	"dev/pci/files.pci"
+file	arch/sgi/pci/pci_machdep.c		pci
 
 # Sun HME Ethernet controllers
 device	hme: ether, ifnet, mii, ifmedia