From owner-svn-src-all@FreeBSD.ORG  Mon Feb 21 01:05:24 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3F00E106566B;
	Mon, 21 Feb 2011 01:05:24 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 122D28FC0A;
	Mon, 21 Feb 2011 01:05:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L15NlZ050827;
	Mon, 21 Feb 2011 01:05:23 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L15N4a050824;
	Mon, 21 Feb 2011 01:05:23 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201102210105.p1L15N4a050824@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Mon, 21 Feb 2011 01:05:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218902 - in stable/7/sys: dev/re pci
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Feb 2011 01:05:24 -0000

Author: yongari
Date: Mon Feb 21 01:05:23 2011
New Revision: 218902
URL: http://svn.freebsd.org/changeset/base/218902

Log:
  MFC r217498:
    Add initial support for RTL8168E/8111E-VL PCIe GbE.

Modified:
  stable/7/sys/dev/re/if_re.c
  stable/7/sys/pci/if_rlreg.h
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/dev/re/if_re.c
==============================================================================
--- stable/7/sys/dev/re/if_re.c	Mon Feb 21 01:04:16 2011	(r218901)
+++ stable/7/sys/dev/re/if_re.c	Mon Feb 21 01:05:23 2011	(r218902)
@@ -221,6 +221,7 @@ static struct rl_hwrev re_hwrevs[] = {
 	{ RL_HWREV_8168D, RL_8169, "8168D/8111D"},
 	{ RL_HWREV_8168DP, RL_8169, "8168DP/8111DP"},
 	{ RL_HWREV_8168E, RL_8169, "8168E/8111E"},
+	{ RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL"},
 	{ 0, 0, NULL }
 };
 
@@ -1347,6 +1348,11 @@ re_attach(device_t dev)
 		    RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT |
 		    RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | RL_FLAG_NOJUMBO;
 		break;
+	case RL_HWREV_8168E_VL:
+		sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR |
+		    RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP |
+		    RL_FLAG_AUTOPAD | RL_FLAG_NOJUMBO;
+		break;
 	case RL_HWREV_8169_8110SB:
 	case RL_HWREV_8169_8110SBL:
 	case RL_HWREV_8169_8110SC:

Modified: stable/7/sys/pci/if_rlreg.h
==============================================================================
--- stable/7/sys/pci/if_rlreg.h	Mon Feb 21 01:04:16 2011	(r218901)
+++ stable/7/sys/pci/if_rlreg.h	Mon Feb 21 01:05:23 2011	(r218902)
@@ -165,6 +165,7 @@
 #define	RL_HWREV_8168D		0x28000000
 #define	RL_HWREV_8168DP		0x28800000
 #define	RL_HWREV_8168E		0x2C000000
+#define	RL_HWREV_8168E_VL	0x2C800000
 #define	RL_HWREV_8168_SPIN1	0x30000000
 #define	RL_HWREV_8100E		0x30800000
 #define	RL_HWREV_8101E		0x34000000