Let se(4) support SiS191, and bring a lot of bugfixes and improvements from

FreeBSD.

1 files changed, 33 insertions, 39 deletions

diff --git a/share/man/man4/se.4 b/share/man/man4/se.4
index 9003d95210d..34fdd419394 100644
--- a/share/man/man4/se.4
+++ b/share/man/man4/se.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: se.4,v 1.3 2010/04/02 23:08:49 schwarze Exp $
+.\"	$OpenBSD: se.4,v 1.4 2010/09/04 12:47:00 miod Exp $
 .\"
 .\" Copyright (c) 2010
 .\"	Christopher Zimmermann <madroach@zakweb.de>. All rights reserved.
@@ -34,24 +34,24 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/sis.4,v 1.2 1999/11/15 23:14:27 phantom Exp $
 .\"
-.Dd $Mdocdate: April 2 2010 $
+.Dd $Mdocdate: September 4 2010 $
 .Dt SE 4
 .Os
 .Sh NAME
 .Nm se
-.Nd SiS 190 10/100/Gigabit Ethernet device
+.Nd SiS 190/191 10/100/Gigabit Ethernet device
 .Sh SYNOPSIS
 .Cd "se* at pci?"
 .Cd "rlphy* at mii?"
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the Fast Ethernet controller SiS190
-integrated into the SiS965L and SiS966L southbridges.
-The SiS191 Gigabit controller in the SiS965 and SiS966 southbridges
-is not yet supported.
+driver provides support for the SiS190 Fast Ethernet controller
+integrated into the SiS965L and SiS966L southbridges,
+and the SiS191 Gigabit controller
+integrated into the SiS965 and SiS966 southbridges.
 .Pp
-The SiS 190/191 are 100Mbps Ethernet MACs with external PHY.
+Both SiS 190 and SiS 191 embed an Ethernet MAC with external PHY.
 They use a bus master DMA and a scatter/gather descriptor scheme
 and include a 64-bit multicast hash filter.
 .Pp
@@ -83,6 +83,13 @@ option can also be used to select either
 or
 .Ar half-duplex
 modes.
+.It 1000baseSX
+Set 1000Mbps (Gigabit Ethernet) on fiber operation.
+Only
+.Ar full-duplex
+mode is supported at this speed.
+.It 1000baseT
+Set 1000Mbps (Gigabit Ethernet) on copper operation.
 .El
 .Pp
 The
@@ -99,33 +106,18 @@ For more information on configuring this device, see
 .Xr ifconfig 8 .
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "seN: couldn't map ports/memory"
-A fatal initialization error has occurred.
-.It "seN: couldn't map/establish interrupt"
-A fatal initialization error has occurred.
 .It "seN: EEPROM read timeout"
-The driver could not acquire the controller's MAC address by EEPROM.
-.It "seN: Could not find ISA bridge to retrieve MAC address"
-The driver could not acquire the controller's MAC address by CMOS.
-.It "seN: MIIBUS timeout"
-The driver could not talk to PHY.
-.It "seN: cannot init the RX map array!"
-A fatal initialization error has occurred.
-.It "seN: cannot init the RX map array!"
-A fatal initialization error has occurred.
-.It "seN: no memory for rx/tx list buffers"
-The driver failed to allocate an mbuf for the receiver/transmitter ring.
-.It "seN: can't map rx/tx list buffers"
-The driver failed to map DMA memory for the receiver/transmitter ring.
-.It "seN: can't alloc rx/tx list buffers"
-The driver failed to create DMA map for the receiver/transmitter ring.
-.It "seN: can't load rx/tx ring mapping"
-The driver failed to load the DMA mapping for the receiver/transmitter ring.
-.It "seN: unable to allocate MBUF"
-.It "seN: initialization failed: no memory for rx buffers"
-The driver failed allocate memory for a receive or transmit buffer.
-.It "seN: unable to load MBUF"
-The driver failed to load the DMA mapping for a receive or transmit buffer.
+The driver could not read the controller's MAC address from its EEPROM.
+.It "seN: invalid EEPROM signature"
+The driver could not find the expected EEPROM signature and could not read
+the controller's MAC address.
+.It "seN: Could not find PCI-ISA bridge"
+The driver could not read the controller's MAC address from the CMOS memory
+connected to the PCI-ISA bridge.
+.It "seN: PHY read timeout"
+The driver could not read data from the PHY.
+.It "seN: PHY write timeout"
+The driver could not write data to the PHY.
 .It "seN: watchdog timeout"
 The device has stopped responding to the network, or there is a problem with
 the network connection (cable).
@@ -148,13 +140,15 @@ driver first appeared in
 .An -nosplit
 The
 .Nm
-driver was written by
+driver was adapted by
+.An Alexander Pohoyda Aq alexander.pohoyda@gmx.net
+from the
+.Xr sis 4
+driver written by
 .An Bill Paul Aq wpaul@ee.columbia.edu ,
-ported to
-.Fx
-by
-.An Alexander Pohoyda Aq alexander.pohoyda@gmx.net ,
 and ported to
 .Ox
 by
 .An Christopher Zimmermann Aq madroach@zakweb.de .
+SiS 191 support was added by
+.An Nikolay Denev Aq ndenev@gmail.com .