From Joerg.Pulz@frm2.tum.de  Tue Aug 11 14:35:04 2009
Return-Path: <Joerg.Pulz@frm2.tum.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7236E106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Aug 2009 14:35:04 +0000 (UTC)
	(envelope-from Joerg.Pulz@frm2.tum.de)
Received: from mailhost.frm2.tum.de (mailhost.frm2.tum.de [129.187.179.12])
	by mx1.freebsd.org (Postfix) with ESMTP id F34298FC1F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Aug 2009 14:35:03 +0000 (UTC)
Received: from localhost (mailhost.frm2.tum.de [129.187.179.12])
	by mailhost.frm2.tum.de (8.14.3/8.14.3) with ESMTP id n7BECTt8068915
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Aug 2009 16:12:30 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: from hades.admin.frm2 (hades.admin.frm2 [172.25.1.10])
	by mailhost.frm2.tum.de (8.14.3/8.14.3) with ESMTP id n7BECOMZ068911
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT)
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Aug 2009 16:12:24 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: from hades.admin.frm2 (localhost [127.0.0.1])
	by hades.admin.frm2 (8.14.3/8.14.2) with ESMTP id n7BECOu6083307
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Aug 2009 16:12:24 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: (from jpulz@localhost)
	by hades.admin.frm2 (8.14.3/8.14.2/Submit) id n7BECOJn083306;
	Tue, 11 Aug 2009 16:12:24 +0200 (CEST)
	(envelope-from jpulz)
Message-Id: <200908111412.n7BECOJn083306@hades.admin.frm2>
Date: Tue, 11 Aug 2009 16:12:24 +0200 (CEST)
From: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
Reply-To: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [re] add bits to support the 8168DP version
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         137672
>Category:       kern
>Synopsis:       [re] [patch] add bits to support the 8168DP version
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    yongari
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 11 14:40:00 UTC 2009
>Closed-Date:    Fri Sep 11 17:27:55 UTC 2009
>Last-Modified:  Fri Sep 11 17:27:55 UTC 2009
>Originator:     Joerg Pulz
>Release:        FreeBSD 8.0-BETA2 amd64
>Organization:
Technische Universitaet Muenchen / FRM II
>Environment:
System: FreeBSD hades.admin.frm2 8.0-BETA2 FreeBSD 8.0-BETA2 #0: Tue Aug 11 12:38:18 CEST 2009     root@hades.admin.frm2:/usr/obj/usr/src/sys/GENERIC  amd64


	
>Description:
	Up to now, FreeBSDs re(4) driver doesn't support the 8168DP, as found in
	e.g. FTS Celsius R570.
	I've added the necessary bits to let re(4) attach to this card to make
	it actually useable.
	While here, add some description consistancy.

	Would be nice to see this in the tree for 8.0-RELEASE.

>How-To-Repeat:
	
>Fix:

	- apply the patch
	- build, install and boot the new kernel

--- RealTek_8168DP.patch begins here ---
--- dev/re/if_re.c.orig	2009-08-11 15:39:50.000000000 +0200
+++ dev/re/if_re.c	2009-08-11 15:40:00.000000000 +0200
@@ -174,7 +174,7 @@
 	{ RT_VENDORID, RT_DEVICEID_8101E, 0,
 	    "RealTek 8101E/8102E/8102EL PCIe 10/100baseTX" },
 	{ RT_VENDORID, RT_DEVICEID_8168, 0,
-	    "RealTek 8168/8168B/8168C/8168CP/8168D/8111B/8111C/8111CP PCIe "
+	    "RealTek 8168/8168B/8168C/8168CP/8168D/8168DP/8111B/8111C/8111CP/8111D/8111DP PCIe "
 	    "Gigabit Ethernet" },
 	{ RT_VENDORID, RT_DEVICEID_8169, 0,
 	    "RealTek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet" },
@@ -217,7 +217,8 @@
 	{ RL_HWREV_8168C, RL_8169, "8168C/8111C"},
 	{ RL_HWREV_8168C_SPIN2, RL_8169, "8168C/8111C"},
 	{ RL_HWREV_8168CP, RL_8169, "8168CP/8111CP"},
-	{ RL_HWREV_8168D, RL_8169, "8168D"},
+	{ RL_HWREV_8168D, RL_8169, "8168D/8111D"},
+	{ RL_HWREV_8168DP, RL_8169, "8168DP/8111DP"},
 	{ 0, 0, NULL }
 };
 
@@ -1282,6 +1283,7 @@
 		/* FALLTHROUGH */
 	case RL_HWREV_8168CP:
 	case RL_HWREV_8168D:
+	case RL_HWREV_8168DP:
 		sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR |
 		    RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP |
 		    RL_FLAG_AUTOPAD;
--- pci/if_rlreg.h.orig	2009-08-11 15:37:23.000000000 +0200
+++ pci/if_rlreg.h	2009-08-11 15:38:15.000000000 +0200
@@ -161,6 +161,7 @@
 #define RL_HWREV_8102EL		0x24800000
 #define RL_HWREV_8102EL_SPIN1	0x24c00000
 #define RL_HWREV_8168D		0x28000000
+#define RL_HWREV_8168DP		0x28800000
 #define RL_HWREV_8168_SPIN1	0x30000000
 #define RL_HWREV_8100E		0x30800000
 #define RL_HWREV_8101E		0x34000000
--- RealTek_8168DP.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->yongari 
Responsible-Changed-By: remko 
Responsible-Changed-When: Tue Aug 11 17:38:02 UTC 2009 
Responsible-Changed-Why:  
Over to Pyun who might want to track this and record it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137672 
State-Changed-From-To: open->patched 
State-Changed-By: yongari 
State-Changed-When: Mon Aug 24 18:58:48 UTC 2009 
State-Changed-Why:  
Patched committed to HEAD(r196516). Thanks a lot! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/137672: commit references a PR
Date: Mon, 24 Aug 2009 18:58:26 +0000 (UTC)

 Author: yongari
 Date: Mon Aug 24 18:58:13 2009
 New Revision: 196516
 URL: http://svn.freebsd.org/changeset/base/196516
 
 Log:
   Add RTL8168DP/RTL8111DP device id. While I'm here append "8111D" to
   the description of RTL8168D as RL_HWREV_8168D can be either
   RTL8168D or RTL8111D.
   
   PR:	kern/137672
   MFC after:	3 days
 
 Modified:
   head/sys/dev/re/if_re.c
   head/sys/pci/if_rlreg.h
 
 Modified: head/sys/dev/re/if_re.c
 ==============================================================================
 --- head/sys/dev/re/if_re.c	Mon Aug 24 18:43:22 2009	(r196515)
 +++ head/sys/dev/re/if_re.c	Mon Aug 24 18:58:13 2009	(r196516)
 @@ -174,8 +174,8 @@ static struct rl_type re_devs[] = {
  	{ RT_VENDORID, RT_DEVICEID_8101E, 0,
  	    "RealTek 8101E/8102E/8102EL PCIe 10/100baseTX" },
  	{ RT_VENDORID, RT_DEVICEID_8168, 0,
 -	    "RealTek 8168/8168B/8168C/8168CP/8168D/8111B/8111C/8111CP PCIe "
 -	    "Gigabit Ethernet" },
 +	    "RealTek 8168/8168B/8168C/8168CP/8168D/8168DP/"
 +	    "8111B/8111C/8111CP/8111DP PCIe Gigabit Ethernet" },
  	{ RT_VENDORID, RT_DEVICEID_8169, 0,
  	    "RealTek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet" },
  	{ RT_VENDORID, RT_DEVICEID_8169SC, 0,
 @@ -217,7 +217,8 @@ static struct rl_hwrev re_hwrevs[] = {
  	{ RL_HWREV_8168C, RL_8169, "8168C/8111C"},
  	{ RL_HWREV_8168C_SPIN2, RL_8169, "8168C/8111C"},
  	{ RL_HWREV_8168CP, RL_8169, "8168CP/8111CP"},
 -	{ RL_HWREV_8168D, RL_8169, "8168D"},
 +	{ RL_HWREV_8168D, RL_8169, "8168D/8111D"},
 +	{ RL_HWREV_8168DP, RL_8169, "8168DP/8111DP"},
  	{ 0, 0, NULL }
  };
  
 @@ -1282,6 +1283,7 @@ re_attach(device_t dev)
  		/* FALLTHROUGH */
  	case RL_HWREV_8168CP:
  	case RL_HWREV_8168D:
 +	case RL_HWREV_8168DP:
  		sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR |
  		    RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP |
  		    RL_FLAG_AUTOPAD;
 
 Modified: head/sys/pci/if_rlreg.h
 ==============================================================================
 --- head/sys/pci/if_rlreg.h	Mon Aug 24 18:43:22 2009	(r196515)
 +++ head/sys/pci/if_rlreg.h	Mon Aug 24 18:58:13 2009	(r196516)
 @@ -161,6 +161,7 @@
  #define RL_HWREV_8102EL		0x24800000
  #define RL_HWREV_8102EL_SPIN1	0x24c00000
  #define RL_HWREV_8168D		0x28000000
 +#define RL_HWREV_8168DP		0x28800000
  #define RL_HWREV_8168_SPIN1	0x30000000
  #define RL_HWREV_8100E		0x30800000
  #define RL_HWREV_8101E		0x34000000
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/137672: commit references a PR
Date: Fri, 28 Aug 2009 17:34:41 +0000 (UTC)

 Author: yongari
 Date: Fri Aug 28 17:34:22 2009
 New Revision: 196618
 URL: http://svn.freebsd.org/changeset/base/196618
 
 Log:
   MFC r196516:
     Add RTL8168DP/RTL8111DP device id. While I'm here append "8111D" to
     the description of RTL8168D as RL_HWREV_8168D can be either
     RTL8168D or RTL8111D.
   
     PR:	kern/137672
   Approved by:	re (kib)
 
 Modified:
   stable/8/sys/   (props changed)
   stable/8/sys/amd64/include/xen/   (props changed)
   stable/8/sys/cddl/contrib/opensolaris/   (props changed)
   stable/8/sys/contrib/dev/acpica/   (props changed)
   stable/8/sys/contrib/pf/   (props changed)
   stable/8/sys/dev/re/if_re.c
   stable/8/sys/dev/xen/xenpci/   (props changed)
   stable/8/sys/pci/if_rlreg.h
 
 Modified: stable/8/sys/dev/re/if_re.c
 ==============================================================================
 --- stable/8/sys/dev/re/if_re.c	Fri Aug 28 16:45:34 2009	(r196617)
 +++ stable/8/sys/dev/re/if_re.c	Fri Aug 28 17:34:22 2009	(r196618)
 @@ -174,8 +174,8 @@ static struct rl_type re_devs[] = {
  	{ RT_VENDORID, RT_DEVICEID_8101E, 0,
  	    "RealTek 8101E/8102E/8102EL PCIe 10/100baseTX" },
  	{ RT_VENDORID, RT_DEVICEID_8168, 0,
 -	    "RealTek 8168/8168B/8168C/8168CP/8168D/8111B/8111C/8111CP PCIe "
 -	    "Gigabit Ethernet" },
 +	    "RealTek 8168/8168B/8168C/8168CP/8168D/8168DP/"
 +	    "8111B/8111C/8111CP/8111DP PCIe Gigabit Ethernet" },
  	{ RT_VENDORID, RT_DEVICEID_8169, 0,
  	    "RealTek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet" },
  	{ RT_VENDORID, RT_DEVICEID_8169SC, 0,
 @@ -217,7 +217,8 @@ static struct rl_hwrev re_hwrevs[] = {
  	{ RL_HWREV_8168C, RL_8169, "8168C/8111C"},
  	{ RL_HWREV_8168C_SPIN2, RL_8169, "8168C/8111C"},
  	{ RL_HWREV_8168CP, RL_8169, "8168CP/8111CP"},
 -	{ RL_HWREV_8168D, RL_8169, "8168D"},
 +	{ RL_HWREV_8168D, RL_8169, "8168D/8111D"},
 +	{ RL_HWREV_8168DP, RL_8169, "8168DP/8111DP"},
  	{ 0, 0, NULL }
  };
  
 @@ -1282,6 +1283,7 @@ re_attach(device_t dev)
  		/* FALLTHROUGH */
  	case RL_HWREV_8168CP:
  	case RL_HWREV_8168D:
 +	case RL_HWREV_8168DP:
  		sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR |
  		    RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP |
  		    RL_FLAG_AUTOPAD;
 
 Modified: stable/8/sys/pci/if_rlreg.h
 ==============================================================================
 --- stable/8/sys/pci/if_rlreg.h	Fri Aug 28 16:45:34 2009	(r196617)
 +++ stable/8/sys/pci/if_rlreg.h	Fri Aug 28 17:34:22 2009	(r196618)
 @@ -161,6 +161,7 @@
  #define RL_HWREV_8102EL		0x24800000
  #define RL_HWREV_8102EL_SPIN1	0x24c00000
  #define RL_HWREV_8168D		0x28000000
 +#define RL_HWREV_8168DP		0x28800000
  #define RL_HWREV_8168_SPIN1	0x30000000
  #define RL_HWREV_8100E		0x30800000
  #define RL_HWREV_8101E		0x34000000
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/137672: commit references a PR
Date: Fri, 11 Sep 2009 17:15:30 +0000 (UTC)

 Author: yongari
 Date: Fri Sep 11 17:15:18 2009
 New Revision: 197095
 URL: http://svn.freebsd.org/changeset/base/197095
 
 Log:
   MFC r196516:
     Add RTL8168DP/RTL8111DP device id. While I'm here append "8111D" to
     the description of RTL8168D as RL_HWREV_8168D can be either
     RTL8168D or RTL8111D.
   
     PR:	kern/137672
 
 Modified:
   stable/7/sys/   (props changed)
   stable/7/sys/contrib/pf/   (props changed)
   stable/7/sys/dev/re/if_re.c
   stable/7/sys/pci/if_rlreg.h
 
 Modified: stable/7/sys/dev/re/if_re.c
 ==============================================================================
 --- stable/7/sys/dev/re/if_re.c	Fri Sep 11 17:12:43 2009	(r197094)
 +++ stable/7/sys/dev/re/if_re.c	Fri Sep 11 17:15:18 2009	(r197095)
 @@ -174,8 +174,8 @@ static struct rl_type re_devs[] = {
  	{ RT_VENDORID, RT_DEVICEID_8101E, 0,
  	    "RealTek 8101E/8102E/8102EL PCIe 10/100baseTX" },
  	{ RT_VENDORID, RT_DEVICEID_8168, 0,
 -	    "RealTek 8168/8168B/8168C/8168CP/8168D/8111B/8111C/8111CP PCIe "
 -	    "Gigabit Ethernet" },
 +	    "RealTek 8168/8168B/8168C/8168CP/8168D/8168DP/"
 +	    "8111B/8111C/8111CP/8111DP PCIe Gigabit Ethernet" },
  	{ RT_VENDORID, RT_DEVICEID_8169, 0,
  	    "RealTek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet" },
  	{ RT_VENDORID, RT_DEVICEID_8169SC, 0,
 @@ -216,7 +216,8 @@ static struct rl_hwrev re_hwrevs[] = {
  	{ RL_HWREV_8168C, RL_8169, "8168C/8111C"},
  	{ RL_HWREV_8168C_SPIN2, RL_8169, "8168C/8111C"},
  	{ RL_HWREV_8168CP, RL_8169, "8168CP/8111CP"},
 -	{ RL_HWREV_8168D, RL_8169, "8168D"},
 +	{ RL_HWREV_8168D, RL_8169, "8168D/8111D"},
 +	{ RL_HWREV_8168DP, RL_8169, "8168DP/8111DP"},
  	{ 0, 0, NULL }
  };
  
 @@ -1280,6 +1281,7 @@ re_attach(device_t dev)
  		/* FALLTHROUGH */
  	case RL_HWREV_8168CP:
  	case RL_HWREV_8168D:
 +	case RL_HWREV_8168DP:
  		sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR |
  		    RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP;
  		/*
 
 Modified: stable/7/sys/pci/if_rlreg.h
 ==============================================================================
 --- stable/7/sys/pci/if_rlreg.h	Fri Sep 11 17:12:43 2009	(r197094)
 +++ stable/7/sys/pci/if_rlreg.h	Fri Sep 11 17:15:18 2009	(r197095)
 @@ -160,6 +160,7 @@
  #define RL_HWREV_8169_8110SC	0x18000000
  #define RL_HWREV_8102EL		0x24800000
  #define RL_HWREV_8168D		0x28000000
 +#define RL_HWREV_8168DP		0x28800000
  #define RL_HWREV_8168_SPIN1	0x30000000
  #define RL_HWREV_8100E		0x30800000
  #define RL_HWREV_8101E		0x34000000
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: yongari 
State-Changed-When: Fri Sep 11 17:26:47 UTC 2009 
State-Changed-Why:  
MFC to stable/7 done. Thank you very much. 

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