Even more pci ethernet devices, based on a diff from Brad.

7 files changed, 93 insertions, 29 deletions

diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27
index c69acb9f779..dc5322a7c4a 100644
--- a/sys/arch/sgi/conf/GENERIC-IP27
+++ b/sys/arch/sgi/conf/GENERIC-IP27
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP27,v 1.10 2009/06/24 16:31:34 deraadt Exp $
+#	$OpenBSD: GENERIC-IP27,v 1.11 2009/06/24 17:27:40 miod Exp $
 #
 # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
 #
@@ -129,12 +129,6 @@ wsdisplay*	at udl?
 
 #### NICs
 dc*		at pci?		# 21143, "tulip" clone ethernet
-fxp*		at pci?		# EtherExpress 10/100B ethernet
-skc*		at pci?		# SysKonnect GEnesis 984x
-sk*		at skc?		#  each port of above
-mskc*		at pci?		# Marvell Yukon-2
-msk*		at mskc?	#  each port of above
-bge*		at pci?		# Broadcom BCM57xx (aka Tigon3)
 bnx*		at pci?		# Broadcom BCM5706/5708 GigE
 em*		at pci?		# Intel Pro/1000 ethernet
 ep*		at pci?		# 3Com 3c59x
@@ -145,6 +139,15 @@ ti*		at pci?		# Alteon ACEnic gigabit Ethernet
 stge*		at pci?		# Sundance TC9021 GigE
 vr*		at pci?		# VIA Rhine Fast Ethernet
 xl*		at pci?		# 3C9xx ethernet
+re*		at pci?		# Realtek 8169/8169S/8110S
+rl*		at pci?		# Realtek 81[23]9 ethernet
+hme*		at pci?		# Sun Happy Meal
+gem*		at pci?		# Sun 'gem' ethernet
+skc*		at pci?		# SysKonnect GEnesis 984x
+sk*		at skc?		#  each port of above
+mskc*		at pci?		# Marvell Yukon-2
+msk*		at mskc?	#  each port of above
+bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
 
 ##### Media Independent Interface (mii) drivers
 exphy*		at mii?		# 3Com internal PHYs
@@ -156,6 +159,7 @@ nsphy*		at mii?		# NS and compatible PHYs
 nsphyter*	at mii?		# NS and compatible PHYs
 qsphy*		at mii?		# Quality Semi QS6612 PHYs
 sqphy*		at mii?		# Seeq 8x220 PHYs
+luphy*		at mii?		# Lucent LU6612 PHY
 rlphy*		at mii?		# RealTek 8139 internal PHYs
 mtdphy*		at mii?		# Myson MTD972 PHYs
 dcphy*		at mii?		# Digital Clone PHYs
@@ -170,6 +174,7 @@ nsgphy*		at mii?		# NS gigabit PHYs
 urlphy*		at mii?		# Realtek RTL8150L internal PHY
 rgephy*		at mii?		# Realtek 8169S/8110S PHY
 ipgphy*		at mii?		# IC Plus IP1000A PHYs
+gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
 ukphy*		at mii?		# "unknown" PHYs
 
 #### Wireless
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30
index d252164e261..0e0efc38955 100644
--- a/sys/arch/sgi/conf/GENERIC-IP30
+++ b/sys/arch/sgi/conf/GENERIC-IP30
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP30,v 1.8 2009/06/24 11:38:40 deraadt Exp $
+#	$OpenBSD: GENERIC-IP30,v 1.9 2009/06/24 17:27:40 miod Exp $
 #
 # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
 #
@@ -138,6 +138,15 @@ ti*		at pci?		# Alteon ACEnic gigabit Ethernet
 stge*		at pci?		# Sundance TC9021 GigE
 vr*		at pci?		# VIA Rhine Fast Ethernet
 xl*		at pci?		# 3C9xx ethernet
+re*		at pci?		# Realtek 8169/8169S/8110S
+rl*		at pci?		# Realtek 81[23]9 ethernet
+hme*		at pci?		# Sun Happy Meal
+gem*		at pci?		# Sun 'gem' ethernet
+skc*		at pci?		# SysKonnect GEnesis 984x
+sk*		at skc?		#  each port of above
+mskc*		at pci?		# Marvell Yukon-2
+msk*		at mskc?	#  each port of above
+bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
 
 ##### Media Independent Interface (mii) drivers
 exphy*		at mii?		# 3Com internal PHYs
@@ -149,6 +158,7 @@ nsphy*		at mii?		# NS and compatible PHYs
 nsphyter*	at mii?		# NS and compatible PHYs
 qsphy*		at mii?		# Quality Semi QS6612 PHYs
 sqphy*		at mii?		# Seeq 8x220 PHYs
+luphy*		at mii?		# Lucent LU6612 PHY
 rlphy*		at mii?		# RealTek 8139 internal PHYs
 mtdphy*		at mii?		# Myson MTD972 PHYs
 dcphy*		at mii?		# Digital Clone PHYs
@@ -163,6 +173,7 @@ nsgphy*		at mii?		# NS gigabit PHYs
 urlphy*		at mii?		# Realtek RTL8150L internal PHY
 rgephy*		at mii?		# Realtek 8169S/8110S PHY
 ipgphy*		at mii?		# IC Plus IP1000A PHYs
+gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
 ukphy*		at mii?		# "unknown" PHYs
 
 #### Wireless
diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32
index 650725d5be7..9f3c440be1c 100644
--- a/sys/arch/sgi/conf/GENERIC-IP32
+++ b/sys/arch/sgi/conf/GENERIC-IP32
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP32,v 1.6 2009/06/21 18:01:54 miod Exp $
+#	$OpenBSD: GENERIC-IP32,v 1.7 2009/06/24 17:27:40 miod Exp $
 #
 # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
 #
@@ -137,6 +137,15 @@ ti*		at pci?		# Alteon ACEnic gigabit Ethernet
 stge*		at pci?		# Sundance TC9021 GigE
 vr*		at pci?		# VIA Rhine Fast Ethernet
 xl*		at pci?		# 3C9xx ethernet
+re*		at pci?		# Realtek 8169/8169S/8110S
+rl*		at pci?		# Realtek 81[23]9 ethernet
+hme*		at pci?		# Sun Happy Meal
+gem*		at pci?		# Sun 'gem' ethernet
+skc*		at pci?		# SysKonnect GEnesis 984x
+sk*		at skc?		#  each port of above
+mskc*		at pci?		# Marvell Yukon-2
+msk*		at mskc?	#  each port of above
+bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
 
 ##### Media Independent Interface (mii) drivers
 exphy*		at mii?		# 3Com internal PHYs
@@ -148,6 +157,7 @@ nsphy*		at mii?		# NS and compatible PHYs
 nsphyter*	at mii?		# NS and compatible PHYs
 qsphy*		at mii?		# Quality Semi QS6612 PHYs
 sqphy*		at mii?		# Seeq 8x220 PHYs
+luphy*		at mii?		# Lucent LU6612 PHY
 rlphy*		at mii?		# RealTek 8139 internal PHYs
 mtdphy*		at mii?		# Myson MTD972 PHYs
 dcphy*		at mii?		# Digital Clone PHYs
@@ -162,6 +172,7 @@ nsgphy*		at mii?		# NS gigabit PHYs
 urlphy*		at mii?		# Realtek RTL8150L internal PHY
 rgephy*		at mii?		# Realtek 8169S/8110S PHY
 ipgphy*		at mii?		# IC Plus IP1000A PHYs
+gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
 ukphy*		at mii?		# "unknown" PHYs
 
 #### Wireless
diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27
index 0c2e298a538..9f8f6bad256 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP27
+++ b/sys/arch/sgi/conf/RAMDISK-IP27
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP27,v 1.5 2009/06/24 11:38:40 deraadt Exp $
+#	$OpenBSD: RAMDISK-IP27,v 1.6 2009/06/24 17:27:40 miod Exp $
 #
 # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
 
@@ -129,8 +129,18 @@ fxp*		at pci?		# EtherExpress 10/100B ethernet
 mtd*		at pci?		# Myson MTD803 3-in-1 Ethernet
 ne*		at pci?		# NE2000-compatible Ethernet
 ti*		at pci?		# Alteon ACEnic gigabit Ethernet
+stge*		at pci?		# Sundance TC9021 GigE
 vr*		at pci?		# VIA Rhine Fast Ethernet
 xl*		at pci?		# 3C9xx ethernet
+re*		at pci?		# Realtek 8169/8169S/8110S
+rl*		at pci?		# Realtek 81[23]9 ethernet
+hme*		at pci?		# Sun Happy Meal
+gem*		at pci?		# Sun 'gem' ethernet
+skc*		at pci?		# SysKonnect GEnesis 984x
+sk*		at skc?		#  each port of above
+mskc*		at pci?		# Marvell Yukon-2
+msk*		at mskc?	#  each port of above
+bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
 
 ##### Media Independent Interface (mii) drivers
 exphy*		at mii?		# 3Com internal PHYs
@@ -142,6 +152,7 @@ nsphy*		at mii?		# NS and compatible PHYs
 nsphyter*	at mii?		# NS and compatible PHYs
 qsphy*		at mii?		# Quality Semi QS6612 PHYs
 sqphy*		at mii?		# Seeq 8x220 PHYs
+luphy*		at mii?		# Lucent LU6612 PHY
 rlphy*		at mii?		# RealTek 8139 internal PHYs
 mtdphy*		at mii?		# Myson MTD972 PHYs
 dcphy*		at mii?		# Digital Clone PHYs
@@ -155,6 +166,8 @@ xmphy*		at mii?		# XaQti XMAC-II PHYs
 nsgphy*		at mii?		# NS gigabit PHYs
 urlphy*		at mii?		# Realtek RTL8150L internal PHY
 rgephy*		at mii?		# Realtek 8169S/8110S PHY
+ipgphy*		at mii?		# IC Plus IP1000A PHYs
+gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
 ukphy*		at mii?		# "unknown" PHYs
 
 #### SCSI Bus devices
diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30
index 908136ef613..07453051054 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP30
+++ b/sys/arch/sgi/conf/RAMDISK-IP30
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP30,v 1.5 2009/06/24 11:38:40 deraadt Exp $
+#	$OpenBSD: RAMDISK-IP30,v 1.6 2009/06/24 17:27:40 miod Exp $
 #
 # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
 
@@ -130,8 +130,18 @@ fxp*		at pci?		# EtherExpress 10/100B ethernet
 mtd*		at pci?		# Myson MTD803 3-in-1 Ethernet
 ne*		at pci?		# NE2000-compatible Ethernet
 ti*		at pci?		# Alteon ACEnic gigabit Ethernet
+stge*		at pci?		# Sundance TC9021 GigE
 vr*		at pci?		# VIA Rhine Fast Ethernet
 xl*		at pci?		# 3C9xx ethernet
+re*		at pci?		# Realtek 8169/8169S/8110S
+rl*		at pci?		# Realtek 81[23]9 ethernet
+hme*		at pci?		# Sun Happy Meal
+gem*		at pci?		# Sun 'gem' ethernet
+skc*		at pci?		# SysKonnect GEnesis 984x
+sk*		at skc?		#  each port of above
+mskc*		at pci?		# Marvell Yukon-2
+msk*		at mskc?	#  each port of above
+bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
 
 ##### Media Independent Interface (mii) drivers
 exphy*		at mii?		# 3Com internal PHYs
@@ -143,6 +153,7 @@ nsphy*		at mii?		# NS and compatible PHYs
 nsphyter*	at mii?		# NS and compatible PHYs
 qsphy*		at mii?		# Quality Semi QS6612 PHYs
 sqphy*		at mii?		# Seeq 8x220 PHYs
+luphy*		at mii?		# Lucent LU6612 PHY
 rlphy*		at mii?		# RealTek 8139 internal PHYs
 mtdphy*		at mii?		# Myson MTD972 PHYs
 dcphy*		at mii?		# Digital Clone PHYs
@@ -156,6 +167,8 @@ xmphy*		at mii?		# XaQti XMAC-II PHYs
 nsgphy*		at mii?		# NS gigabit PHYs
 urlphy*		at mii?		# Realtek RTL8150L internal PHY
 rgephy*		at mii?		# Realtek 8169S/8110S PHY
+ipgphy*		at mii?		# IC Plus IP1000A PHYs
+gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
 ukphy*		at mii?		# "unknown" PHYs
 
 #### SCSI Bus devices
diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32
index 85471599258..1a68b445b59 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP32
+++ b/sys/arch/sgi/conf/RAMDISK-IP32
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP32,v 1.4 2009/06/21 18:01:54 miod Exp $
+#	$OpenBSD: RAMDISK-IP32,v 1.5 2009/06/24 17:27:40 miod Exp $
 #
 # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
 
@@ -126,8 +126,18 @@ fxp*		at pci?		# EtherExpress 10/100B ethernet
 mtd*		at pci?		# Myson MTD803 3-in-1 Ethernet
 ne*		at pci?		# NE2000-compatible Ethernet
 ti*		at pci?		# Alteon ACEnic gigabit Ethernet
+stge*		at pci?		# Sundance TC9021 GigE
 vr*		at pci?		# VIA Rhine Fast Ethernet
 xl*		at pci?		# 3C9xx ethernet
+re*		at pci?		# Realtek 8169/8169S/8110S
+rl*		at pci?		# Realtek 81[23]9 ethernet
+hme*		at pci?		# Sun Happy Meal
+gem*		at pci?		# Sun 'gem' ethernet
+skc*		at pci?		# SysKonnect GEnesis 984x
+sk*		at skc?		#  each port of above
+mskc*		at pci?		# Marvell Yukon-2
+msk*		at mskc?	#  each port of above
+bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
 
 ##### Media Independent Interface (mii) drivers
 exphy*		at mii?		# 3Com internal PHYs
@@ -139,6 +149,7 @@ nsphy*		at mii?		# NS and compatible PHYs
 nsphyter*	at mii?		# NS and compatible PHYs
 qsphy*		at mii?		# Quality Semi QS6612 PHYs
 sqphy*		at mii?		# Seeq 8x220 PHYs
+luphy*		at mii?		# Lucent LU6612 PHY
 rlphy*		at mii?		# RealTek 8139 internal PHYs
 mtdphy*		at mii?		# Myson MTD972 PHYs
 dcphy*		at mii?		# Digital Clone PHYs
@@ -152,6 +163,8 @@ xmphy*		at mii?		# XaQti XMAC-II PHYs
 nsgphy*		at mii?		# NS gigabit PHYs
 urlphy*		at mii?		# Realtek RTL8150L internal PHY
 rgephy*		at mii?		# Realtek 8169S/8110S PHY
+ipgphy*		at mii?		# IC Plus IP1000A PHYs
+gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
 ukphy*		at mii?		# "unknown" PHYs
 
 #### WS console
diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi
index 3c3876d974a..028cfc9ef39 100644
--- a/sys/arch/sgi/conf/files.sgi
+++ b/sys/arch/sgi/conf/files.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sgi,v 1.26 2009/06/13 21:48:03 miod Exp $
+#	$OpenBSD: files.sgi,v 1.27 2009/06/24 17:27:40 miod Exp $
 #
 # maxpartitions must be first item in files.${ARCH}
 #
@@ -8,6 +8,7 @@ maxusers 2 8 64
 
 #	Required files
 
+file	dev/cninit.c
 file	arch/sgi/sgi/autoconf.c
 file	arch/sgi/sgi/bus_dma.c
 file	arch/sgi/sgi/conf.c
@@ -21,6 +22,9 @@ file	arch/sgi/sgi/mutex.c
 file	arch/sgi/sgi/sginode.c			tgt_origin200 | tgt_origin2000
 file	arch/sgi/sgi/wscons_machdep.c		wsdisplay
 
+# RAM disk for boot
+major	{rd = 8}
+
 #
 # Media Indepedent Interface (mii)
 #
@@ -80,8 +84,18 @@ major	{cd = 3}
 
 include	"dev/i2o/files.i2o"
 
+#
+#	PCI Bus support
+#
+
 include	"dev/pci/files.pci"
 
+# Sun HME Ethernet controllers
+device	hme: ether, ifnet, mii, ifmedia
+file	dev/ic/hme.c				hme
+attach	hme at pci with hme_pci
+file	dev/pci/if_hme_pci.c			hme_pci
+
 # IOC3
 define	ioc {[base = -1]}
 device	ioc: onewirebus
@@ -143,10 +157,6 @@ include	"dev/wsfont/files.wsfont"
 include	"dev/wscons/files.wscons"
 
 #
-#	PCI Bus support
-#
-
-#
 # Machine-independent USB drivers
 #
 include	"dev/usb/files.usb"
@@ -164,15 +174,3 @@ device	owserial
 attach	owserial at onewire
 file	arch/sgi/dev/owserial.c			owserial
 file	arch/sgi/dev/owmem_subr.c		owmac | owserial
-
-#
-# Specials.
-#
-# RAM disk for boot
-major	{rd = 8}
-
-#
-#	Common files
-#
-
-file	dev/cninit.c