From oleg@core.zp.ua  Sun Dec 19 08:19:09 2004
Return-Path: <oleg@core.zp.ua>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A75BB16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 19 Dec 2004 08:19:09 +0000 (GMT)
Received: from core.zp.ua (core.zp.ua [193.108.112.7])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C576D43D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 19 Dec 2004 08:19:07 +0000 (GMT)
	(envelope-from oleg@core.zp.ua)
Received: from core.zp.ua (oleg@localhost [127.0.0.1])
	by core.zp.ua with ESMTP id iBJ8J39L022028
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 19 Dec 2004 10:19:03 +0200 (EET)
	(envelope-from oleg@core.zp.ua)
Received: (from oleg@localhost)
	by core.zp.ua  id iBJ8J3Pd022027;
	 Sun, 19 Dec 2004 10:19:03 +0200 (EET)
Message-Id: <200412190819.iBJ8J3Pd022027@core.zp.ua>
Date: Sun, 19 Dec 2004 10:19:03 +0200 (EET)
From: "Oleg V. Nauman" <oleg@reis.zp.ua>
Reply-To: "Oleg V. Nauman" <oleg@reis.zp.ua>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] xl(4): add support for 3C920B-EMB-WNM Integrated Fast Ethernet Controller
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         75253
>Category:       kern
>Synopsis:       [patch] xl(4): add support for 3C920B-EMB-WNM Integrated Fast Ethernet Controller
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    rwatson
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 19 08:20:23 GMT 2004
>Closed-Date:    Sat Apr 09 22:18:29 GMT 2005
>Last-Modified:  Sat Apr 09 22:18:29 GMT 2005
>Originator:     Oleg V. Nauman
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
ReIS LLC
>Environment:
System: FreeBSD daisy.reis.zp.ua 5.3-STABLE FreeBSD 5.3-STABLE #5: Fri Dec 17 17:29:02 EET 2004     root@daisy.reis.zp.ua:/usr/src/sys/i386/compile/DAISY  i386

>Description:
I have motherboard with integrated 3Com ethernet controller, listed
from pciconf output as:

xl0@pci2:8:0:   class=0x020000 card=0xffffffff chip=0x920210b7 rev=0x40 hdr=0x00
vendor   = '3COM Corp, Networking Division'
device   = '3C920B-EMB-WNM Integrated Fast Ethernet Controller'
class    = network
subclass = ethernet

but current xl(4) driver does not have support for this controller.
Very trivial patch adds support for him, and this controller seems working OK
(tested with heavy NFS traffic):

xl0: <3Com 3c920B-EMB-WNM Integrated Fast Etherlink XL> port 0xec00-0xec7f mem 0xfe100000-0xfe10007f irq 3 at device 8.0 on pci2
miibus1: <MII bus> on xl0
xl0: Ethernet address: 00:11:2f:44:6f:87

xl0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
	options=9<RXCSUM,VLAN_MTU>
	inet 10.20.30.211 netmask 0xffffff00 broadcast 10.20.30.255
	ether 00:11:2f:44:6f:87
	media: Ethernet autoselect (100baseTX)
	status: active
	
And supports at least autonegotiation without any problems.

>How-To-Repeat:

>Fix:

--- /usr/src/sys/pci/if_xl.c.orig	Fri Nov 12 10:53:08 2004
+++ /usr/src/sys/pci/if_xl.c	Fri Dec 17 16:31:46 2004
@@ -188,6 +188,8 @@
 		"3Com 3c905C-TX Fast Etherlink XL" },
 	{ TC_VENDORID, TC_DEVICEID_TORNADO_10_100BT_920B,
 		"3Com 3c920B-EMB Integrated Fast Etherlink XL" },
+	{ TC_VENDORID, TC_DEVICEID_TORNADO_10_100BT_920B_WNM,
+		"3Com 3c920B-EMB-WNM Integrated Fast Etherlink XL" },
 	{ TC_VENDORID, TC_DEVICEID_HURRICANE_10_100BT_SERV,
 		"3Com 3c980 Fast Etherlink XL" },
 	{ TC_VENDORID, TC_DEVICEID_TORNADO_10_100BT_SERV,
@@ -1172,6 +1174,7 @@
 	case TC_DEVICEID_HURRICANE_656B:	/* 3c656B */
 	case TC_DEVICEID_TORNADO_656C:		/* 3c656C */
 	case TC_DEVICEID_TORNADO_10_100BT_920B:	/* 3c920B-EMB */
+	case TC_DEVICEID_TORNADO_10_100BT_920B_WNM:	/* 3c920B-EMB-WNM */
 		sc->xl_media = XL_MEDIAOPT_MII;
 		sc->xl_xcvr = XL_XCVR_MII;
 		if (verbose)
@@ -1269,7 +1272,8 @@
 	    did == TC_DEVICEID_HURRICANE_656B)
 		sc->xl_flags |= XL_FLAG_INVERT_MII_PWR |
 		    XL_FLAG_INVERT_LED_PWR;
-	if (did == TC_DEVICEID_TORNADO_10_100BT_920B)
+	if (did == TC_DEVICEID_TORNADO_10_100BT_920B ||
+	    did == TC_DEVICEID_TORNADO_10_100BT_920B_WNM)
 		sc->xl_flags |= XL_FLAG_PHYOK;
 
 	switch (did) {

--- /usr/src/sys/pci/if_xlreg.h.orig	Sun Aug 22 14:42:15 2004
+++ /usr/src/sys/pci/if_xlreg.h	Fri Dec 17 16:26:33 2004
@@ -680,6 +680,7 @@
 #define TC_DEVICEID_CYCLONE_10_100FX		0x905A
 #define TC_DEVICEID_TORNADO_10_100BT		0x9200
 #define TC_DEVICEID_TORNADO_10_100BT_920B	0x9201
+#define TC_DEVICEID_TORNADO_10_100BT_920B_WNM	0x9202
 #define TC_DEVICEID_HURRICANE_10_100BT_SERV	0x9800
 #define TC_DEVICEID_TORNADO_10_100BT_SERV	0x9805
 #define TC_DEVICEID_HURRICANE_SOHO100TX		0x7646
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: rwatson 
State-Changed-When: Mon Jan 3 19:17:20 GMT 2005 
State-Changed-Why:  
Committed to FreeBSD CVS HEAD (6.x) as if_xl.c:1.183 and if_xlreg.h:1.51. 
Will MFC after two weeks.  Thanks for the patch! 



Responsible-Changed-From-To: freebsd-bugs->rwatson 
Responsible-Changed-By: rwatson 
Responsible-Changed-When: Mon Jan 3 19:17:20 GMT 2005 
Responsible-Changed-Why:  
Grab ownership of this PR. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=75253 

From: Matteo Riondato <rionda@gufi.org>
To: bug-followup@freebsd.org
Cc: rwatson@freebsd.org
Subject: Re: kern/75253 [patch] xl(4): add support for 3C920B-EMB-WNM Integrated Fast Ethernet Controller
Date: Fri, 8 Apr 2005 13:32:57 +0200

 --1y1tiN5hVw5cPBDe
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 The patch was committed and MFCed, so the PR can be closed.
 Thanks
 Best Regards
 --=20
 Rionda aka Matteo Riondato
 Disinformato per default
 G.U.F.I. Staff Member (http://www.gufi.org)
 FreeSBIE Developer (http://www.freesbie.org)
 
 --1y1tiN5hVw5cPBDe
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (FreeBSD)
 
 iD8DBQFCVmvp2Mp4pR7Fa+wRAm5hAJ9szK65Zy78bDY1DJDQpYuSQrPz4gCcCL2d
 w4PEaOhThrFFi23AR7n5K54=
 =7JJc
 -----END PGP SIGNATURE-----
 
 --1y1tiN5hVw5cPBDe--
State-Changed-From-To: patched->closed 
State-Changed-By: rwatson 
State-Changed-When: Sat Apr 9 22:17:36 GMT 2005 
State-Changed-Why:  
Closed as it has been committed and merged.  Thanks for the patch (and 
reminder). 


http://www.freebsd.org/cgi/query-pr.cgi?pr=75253 
>Unformatted:
