10 files changed, 22 insertions, 1 deletions

diff --git a/etc/devd.conf b/etc/devd.conf
index 79e5825dd9167..4468c87c34999 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -20,7 +20,8 @@ options {
 	set ethernet-nic-regex
 		"(an|ar|ath|aue|awi|axe|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|\
 		ep|ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\
-		rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vr|vx|wb|wi|xe|xl)[0-9]+";
+		rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vge|vr|vx|wb|wi|xe|\
+		xl)[0-9]+";
 	set scsi-controller-regex
 		"(adv|advw|aic|aha|ahb|ahc|ahd|bt|ct|iir|isp|mly|mpt|ncv|nsp|\
 		stg|sym|wds)[0-9]+";
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 6c579b2680f80..08e50e2014e75 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -316,6 +316,7 @@ MAN=	aac.4 \
 	uvisor.4 \
 	uvscom.4 \
 	vga.4 \
+	vge.4 \
 	vinum.4 \
 	vinumdebug.4 \
 	vlan.4 \
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 5e25d5dfa294c..9d9ebc0c941b5 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -182,6 +182,7 @@ device		ste		# Sundance ST201 (D-Link DFE-550TX)
 device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		tl		# Texas Instruments ThunderLAN
 device		tx		# SMC EtherPower II (83c170 ``EPIC'')
+device		vge		# VIA VT612x gigabit ethernet
 device		vr		# VIA Rhine, Rhine II
 device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
diff --git a/sys/conf/files b/sys/conf/files
index a86432163ea33..95ce540f2d474 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -549,6 +549,7 @@ dev/mem/memdev.c	optional mem
 dev/mii/amphy.c		optional miibus
 dev/mii/bmtphy.c	optional miibus
 dev/mii/brgphy.c	optional miibus
+dev/mii/ciphy.c		optional miibus
 dev/mii/dcphy.c		optional miibus pci
 dev/mii/e1000phy.c	optional miibus
 dev/mii/exphy.c		optional miibus
@@ -841,6 +842,7 @@ dev/vinum/vinumrequest.c	optional vinum
 dev/vinum/vinumrevive.c		optional vinum
 dev/vinum/vinumstate.c		optional vinum
 dev/vinum/vinumutil.c		optional vinum
+dev/vge/if_vge.c		optional vge
 dev/vx/if_vx.c			optional vx
 dev/vx/if_vx_eisa.c		optional vx eisa
 dev/vx/if_vx_pci.c		optional vx pci
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index 1f58417caceb5..6415c92a6db7e 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -52,6 +52,7 @@ $FreeBSD$
 oui ALTIMA			0x0010a9	Altima Communications
 oui AMD				0x00001a	Advanced Micro Devices
 oui BROADCOM			0x001018	Broadcom Corporation
+oui CICADA			0x0003F1	Cicada Semiconductor
 oui DAVICOM			0x00606e	Davicom Semiconductor
 oui ICS				0x00a0be	Integrated Circuit Systems
 oui INTEL			0x00aa00	Intel
@@ -121,6 +122,11 @@ model xxBROADCOM BCM5703	0x0016 BCM5703 10/100/1000baseTX PHY
 model xxBROADCOM BCM5704	0x0019 BCM5704 10/100/1000baseTX PHY
 model xxBROADCOM BCM5705	0x001a BCM5705 10/100/1000baseTX PHY
 
+/* Cicada Semiconductor PHYs (now owned by Vitesse?) */
+model CICADA CS8201		0x0001 Cicada CS8201 10/100/1000TX PHY
+model CICADA CS8201A		0x0020 Cicada CS8201 10/100/1000TX PHY
+model CICADA CS8201B		0x0021 Cicada CS8201 10/100/1000TX PHY
+
 /* Davicom Semiconductor PHYs */
 model xxDAVICOM DM9101		0x0000 DM9101 10/100 media interface
 
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index 14c5efc620bee..39e44500c7ec9 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -1158,6 +1158,7 @@ vge_detach(dev)
 	if (sc->vge_parent_tag)
 		bus_dma_tag_destroy(sc->vge_parent_tag);
 
+	VGE_UNLOCK(sc);
 	mtx_destroy(&sc->vge_mtx);
 
 	return (0);
@@ -1547,6 +1548,7 @@ vge_txeof(sc)
 	 * This is done in case the transmitter has gone idle.
 	 */
 	if (sc->vge_ldata.vge_tx_free != VGE_TX_DESC_CNT) {
+		CSR_WRITE_2(sc, VGE_TXQCSRS, VGE_TXQCSR_WAK0);
 		CSR_WRITE_1(sc, VGE_CRS1, VGE_CR1_TIMER0_ENABLE);
 	}
 
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 221d4b5aca03d..6bfc8b50c070c 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -191,6 +191,8 @@ device		bfe		# Broadcom BCM440x 10/100 Ethernet
 device		bge		# Broadcom BCM570xx Gigabit Ethernet
 device		dc		# DEC/Intel 21143 and various workalikes
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
+device		lge		# Level 1 LXT1001 gigabit ethernet
+device		nge		# NatSemi DP83820 gigabit ethernet
 device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'lnc')
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
@@ -201,6 +203,7 @@ device		ste		# Sundance ST201 (D-Link DFE-550TX)
 device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		tl		# Texas Instruments ThunderLAN
 device		tx		# SMC EtherPower II (83c170 ``EPIC'')
+device		vge		# VIA VT612x gigabit ethernet
 device		vr		# VIA Rhine, Rhine II
 device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index e052f558a0869..b1f8207e9d9a1 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -238,6 +238,7 @@ SUBDIR=	${_3dfx} \
 	uvisor \
 	uvscom \
 	${_vesa} \
+	vge \
 	vinum \
 	vpo \
 	vr \
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 6956a4889f6b0..f8f981232b257 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -172,6 +172,8 @@ device		miibus		# MII bus support
 device		bfe		# Broadcom BCM440x 10/100 Ethernet
 device		bge		# Broadcom BCM570xx Gigabit Ethernet
 device		dc		# DEC/Intel 21143 and various workalikes
+device		lge		# Level 1 LXT1001 gigabit ethernet
+device		nge		# NatSemi DP83820 gigabit ethernet
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'lnc')
 device		re		# RealTek 8139C+/8169/8169S/8110S
@@ -183,6 +185,7 @@ device		ste		# Sundance ST201 (D-Link DFE-550TX)
 device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		tl		# Texas Instruments ThunderLAN
 device		tx		# SMC EtherPower II (83c170 ``EPIC'')
+device		vge		# VIA VT612x gigabit ethernet
 device		vr		# VIA Rhine, Rhine II
 device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c
index 2ee80745c13fd..bbc3f79977e4a 100644
--- a/usr.sbin/sysinstall/devices.c
+++ b/usr.sbin/sysinstall/devices.c
@@ -125,6 +125,7 @@ static struct _devname {
     { DEVICE_TYPE_NETWORK,	"txp",		"3Com 3cR990 ethernet card"					},
     { DEVICE_TYPE_NETWORK,	"ti",		"Alteon Networks PCI gigabit ethernet card"			},
     { DEVICE_TYPE_NETWORK,	"tl",		"Texas Instruments ThunderLAN PCI ethernet card"		},
+    { DEVICE_TYPE_NETWORK,	"vge",		"VIA VT612x PCI gigabit ethernet card"			},
     { DEVICE_TYPE_NETWORK,	"vr",		"VIA VT3043/VT86C100A Rhine PCI ethernet card"			},
     { DEVICE_TYPE_NETWORK,	"vlan",		"IEEE 802.1Q VLAN network interface"				},
     { DEVICE_TYPE_NETWORK,	"vx",		"3COM 3c590 / 3c595 ethernet card"				},