Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Apr 2010 17:22:02 +0000 (UTC)
From:      Pyun YongHyeon <yongari@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r207228 - in stable/7/sys: amd64/conf boot/forth conf dev/sge i386/conf modules modules/sge
Message-ID:  <201004261722.o3QHM2Wh048655@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yongari
Date: Mon Apr 26 17:22:02 2010
New Revision: 207228
URL: http://svn.freebsd.org/changeset/base/207228

Log:
  MFC r206625:
    Add driver for Silicon Integrated Systems SiS190/191 Fast/Gigabit Ethernet.
    This driver was written by Alexander Pohoyda and greatly enhanced
    by Nikolay Denev. I don't have these hardwares but this driver was
    tested by Nikolay Denev and xclin.
  
    Because SiS didn't release data sheet for this controller, programming
    information came from Linux driver and OpenSolaris. Unlike other open
    source driver for SiS190/191, sge(4) takes full advantage of TX/RX
    checksum offloading and does not require additional copy operation in
    RX handler.
    The controller seems to have advanced offloading features like VLAN
    hardware tag insertion/stripping, TCP segmentation offload(TSO) as
    well as jumbo frame support but these features are not available
    yet. Special thanks to xclin <xclin<> cs dot nctu dot edu dot tw>
    who sent fix for receiving VLAN oversized frames.

Added:
  stable/7/sys/dev/sge/
     - copied from r206625, head/sys/dev/sge/
  stable/7/sys/modules/sge/
     - copied from r206625, head/sys/modules/sge/
Modified:
  stable/7/sys/amd64/conf/GENERIC
  stable/7/sys/boot/forth/loader.conf
  stable/7/sys/conf/NOTES
  stable/7/sys/conf/files
  stable/7/sys/dev/sge/if_sge.c
  stable/7/sys/i386/conf/GENERIC
  stable/7/sys/modules/Makefile
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/conf/GENERIC
==============================================================================
--- stable/7/sys/amd64/conf/GENERIC	Mon Apr 26 17:03:56 2010	(r207227)
+++ stable/7/sys/amd64/conf/GENERIC	Mon Apr 26 17:22:02 2010	(r207228)
@@ -213,6 +213,7 @@ device		pcn		# AMD Am79C97x PCI 10/100 (
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
 device		sf		# Adaptec AIC-6915 (``Starfire'')
+device		sge		# Silicon Integrated Systems SiS190/191
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)

Modified: stable/7/sys/boot/forth/loader.conf
==============================================================================
--- stable/7/sys/boot/forth/loader.conf	Mon Apr 26 17:03:56 2010	(r207227)
+++ stable/7/sys/boot/forth/loader.conf	Mon Apr 26 17:22:02 2010	(r207228)
@@ -261,6 +261,7 @@ if_rl_load="NO"			# RealTek 8129/8139
 if_rue_load="NO"		# RealTek RTL8150 USB to Fast Ethernet
 if_sbni_load="NO"		# Granch SBNI12 leased line adapters
 if_sf_load="NO"			# Adaptec Duralink PCI (AIC-6915 "starfire")
+if_sge_load="NO"		# Silicon Integrated Systems SiS190/191
 if_sis_load="NO"		# Silicon Integrated Systems SiS 900/7016
 if_sk_load="NO"			# SysKonnect SK-984x series PCI Gigabit Ethernet
 if_sn_load="NO"			# SMC 91Cxx

Modified: stable/7/sys/conf/NOTES
==============================================================================
--- stable/7/sys/conf/NOTES	Mon Apr 26 17:03:56 2010	(r207227)
+++ stable/7/sys/conf/NOTES	Mon Apr 26 17:22:02 2010	(r207228)
@@ -1800,6 +1800,7 @@ device		miibus
 #       This includes dual and quad port cards, as well as one 100baseFX card.
 #       Most of these are 64-bit PCI devices, except for one single port
 #       card which is 32-bit.
+# sge:  Silicon Integrated Systems SiS190/191 Fast/Gigabit Ethernet adapter
 # sis:  Support for NICs based on the Silicon Integrated Systems SiS 900,
 #       SiS 7016 and NS DP83815 PCI fast ethernet controller chips.
 # sbsh:	Support for Granch SBNI16 SHDSL modem PCI adapters
@@ -1897,6 +1898,7 @@ device		rl		# RealTek 8129/8139
 device		pcn		# AMD Am79C97x PCI 10/100 NICs
 device		sf		# Adaptec AIC-6915 (``Starfire'')
 device		sbsh		# Granch SBNI16 SHDSL modem
+device		sge		# Silicon Integrated Systems SiS190/191
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)

Modified: stable/7/sys/conf/files
==============================================================================
--- stable/7/sys/conf/files	Mon Apr 26 17:03:56 2010	(r207227)
+++ stable/7/sys/conf/files	Mon Apr 26 17:22:02 2010	(r207228)
@@ -1110,6 +1110,7 @@ dev/scd/scd.c			optional scd isa
 dev/scd/scd_isa.c		optional scd isa
 dev/sdhci/sdhci.c		optional sdhci pci
 dev/sf/if_sf.c			optional sf pci
+dev/sge/if_sge.c		optional sge pci
 dev/si/si.c			optional si
 dev/si/si2_z280.c		optional si
 dev/si/si3_t225.c		optional si

Modified: stable/7/sys/dev/sge/if_sge.c
==============================================================================
--- head/sys/dev/sge/if_sge.c	Wed Apr 14 20:45:33 2010	(r206625)
+++ stable/7/sys/dev/sge/if_sge.c	Mon Apr 26 17:22:02 2010	(r207228)
@@ -467,7 +467,7 @@ sge_rxfilter(struct sge_softc *sc)
 	}
 	rxfilt |= AcceptMulticast;
 	/* Now program new ones. */
-	if_maddr_rlock(ifp);
+	IF_ADDR_LOCK(ifp);
 	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
@@ -475,7 +475,7 @@ sge_rxfilter(struct sge_softc *sc)
 		    ifma->ifma_addr), ETHER_ADDR_LEN);
 		hashes[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
 	}
-	if_maddr_runlock(ifp);
+	IF_ADDR_UNLOCK(ifp);
 done:
 	CSR_WRITE_2(sc, RxMacControl, rxfilt | 0x02);
 	CSR_WRITE_4(sc, RxHashTable, hashes[0]);

Modified: stable/7/sys/i386/conf/GENERIC
==============================================================================
--- stable/7/sys/i386/conf/GENERIC	Mon Apr 26 17:03:56 2010	(r207227)
+++ stable/7/sys/i386/conf/GENERIC	Mon Apr 26 17:22:02 2010	(r207228)
@@ -224,6 +224,7 @@ device		pcn		# AMD Am79C97x PCI 10/100 (
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
 device		sf		# Adaptec AIC-6915 (``Starfire'')
+device		sge		# Silicon Integrated Systems SiS190/191
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)

Modified: stable/7/sys/modules/Makefile
==============================================================================
--- stable/7/sys/modules/Makefile	Mon Apr 26 17:03:56 2010	(r207227)
+++ stable/7/sys/modules/Makefile	Mon Apr 26 17:22:02 2010	(r207228)
@@ -253,6 +253,7 @@ SUBDIR=	${_3dfx} \
 	sdhci \
 	sem \
 	sf \
+	sge \
 	${_sio} \
 	sis \
 	sk \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004261722.o3QHM2Wh048655>