From owner-freebsd-net@FreeBSD.ORG Sun Oct 27 12:13:47 2013 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3F3CCF0 for ; Sun, 27 Oct 2013 12:13:47 +0000 (UTC) (envelope-from eocallaghan@alterapraxis.com) Received: from smtp.alterapraxis.com (unknown [101.164.33.212]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8502A2563 for ; Sun, 27 Oct 2013 12:13:46 +0000 (UTC) Received: from smtp.alterapraxis.com (tony [127.0.0.1]) by smtp.alterapraxis.com (Postfix) with ESMTP id A7948634852 for ; Sun, 27 Oct 2013 23:11:19 +1100 (EST) Received: from tinkerbell.alterapraxis.com (unknown [101.164.33.212]) (using SSLv3 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: eocallaghan@alterapraxis.com) by smtp.alterapraxis.com (Postfix) with ESMTPSA id 6212E63484A for ; Sun, 27 Oct 2013 23:11:18 +1100 (EST) Date: Sun, 27 Oct 2013 23:13:25 +1100 From: Edward O'Callaghan To: freebsd-net@freebsd.org Subject: re(4) resync. Adds preliminary support for 8168G, 8168EP, 8168GU, 8411B and 8106EUS. Message-ID: <20131027231325.2719b3c9.eocallaghan@alterapraxis.com> Organization: Altera Praxis Pty Ltd X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.22; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA512; boundary="Sig_/+_L+578aFh1LcEL6OaLqt2L"; protocol="application/pgp-signature" X-Virus-Scanned: ClamAV using ClamSMTP X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Oct 2013 12:13:47 -0000 --Sig_/+_L+578aFh1LcEL6OaLqt2L Content-Type: multipart/mixed; boundary="MP_/0wFFVR_dOtdshJmu5wgtM3." --MP_/0wFFVR_dOtdshJmu5wgtM3. Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi, This is a follow up. I have tested most of these NIC's now and this patch _should_ be fine to commit to HEAD. Could someone please help me mediate this? This also fixes kern/183167. Please disregards the patches in the PR. Kind Regards, Edward. --MP_/0wFFVR_dOtdshJmu5wgtM3. Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-re-4-resync.-Adds-preliminary-support-for-8168G-8168.patch =46rom 5357870e5d9129a3f098e48d47e34f1c40924485 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Sun, 27 Oct 2013 23:03:53 +1100 Subject: [PATCH] re(4) resync. Adds preliminary support for 8168G, 8168EP, 8168GU, 8411B and 8106EUS. Organization: Altera Praxis Pty Ltd. Signed-off-by: Edward O'Callaghan --- sys/dev/re/if_re.c | 8 ++++++++ sys/pci/if_rlreg.h | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index 381fa87..0de569f 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -234,7 +234,11 @@ static const struct rl_hwrev re_hwrevs[] =3D { { RL_HWREV_8168E, RL_8169, "8168E/8111E", RL_JUMBO_MTU_9K}, { RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K}, { RL_HWREV_8168F, RL_8169, "8168F/8111F", RL_JUMBO_MTU_9K}, + { RL_HWREV_8168G, RL_8169, "8168G/8111G", RL_JUMBO_MTU_9K}, + { RL_HWREV_8168EP, RL_8169, "8168G/8111EP", RL_JUMBO_MTU_9K}, + { RL_HWREV_8168GU, RL_8169, "8168G/8111GU", RL_JUMBO_MTU_9K}, { RL_HWREV_8411, RL_8169, "8411", RL_JUMBO_MTU_9K}, + { RL_HWREV_8411B, RL_8169, "8411B", RL_JUMBO_MTU_9K}, { 0, 0, NULL, 0 } }; =20 @@ -1451,6 +1455,7 @@ re_attach(device_t dev) RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2 | RL_FLAG_WAIT_TXPOLL | RL_FLAG_WOL_MANLINK; break; + case RL_HWREV_8168GU: case RL_HWREV_8168E: sc->rl_flags |=3D RL_FLAG_PHYWAKE | RL_FLAG_PHYWAKE_PM | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | @@ -1458,8 +1463,11 @@ re_attach(device_t dev) RL_FLAG_WOL_MANLINK; break; case RL_HWREV_8168E_VL: + case RL_HWREV_8168EP: case RL_HWREV_8168F: + case RL_HWREV_8168G: case RL_HWREV_8411: + case RL_HWREV_8411B: sc->rl_flags |=3D RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2 | diff --git a/sys/pci/if_rlreg.h b/sys/pci/if_rlreg.h index 142fe48..89440e3 100644 --- a/sys/pci/if_rlreg.h +++ b/sys/pci/if_rlreg.h @@ -174,7 +174,7 @@ #define RL_HWREV_8102EL_SPIN1 0x24C00000 #define RL_HWREV_8168D 0x28000000 #define RL_HWREV_8168DP 0x28800000 -#define RL_HWREV_8168E 0x2C000000 +#define RL_HWREV_8168E 0x2C000000 /* 8105E */ #define RL_HWREV_8168E_VL 0x2C800000 #define RL_HWREV_8168B_SPIN1 0x30000000 #define RL_HWREV_8100E 0x30800000 @@ -192,6 +192,10 @@ #define RL_HWREV_8106E 0x44800000 #define RL_HWREV_8168F 0x48000000 #define RL_HWREV_8411 0x48800000 +#define RE_HWREV_8411B 0x5C800000 +#define RE_HWREV_8168G 0x4C000000 +#define RE_HWREV_8168EP 0x50000000 +#define RE_HWREV_8168GU 0x50800000 /* 8106EUS */ #define RL_HWREV_8139 0x60000000 #define RL_HWREV_8139A 0x70000000 #define RL_HWREV_8139AG 0x70800000 --=20 1.8.4.1 --MP_/0wFFVR_dOtdshJmu5wgtM3.-- --Sig_/+_L+578aFh1LcEL6OaLqt2L Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBCgAGBQJSbQNqAAoJENeyf/ug44dtLmUP/3yHCmLJEt2EH26TtxHj+Ozq GpIWSQu7y2kHGzq4co5EFzD0pY7R/6sUjesO9R8Cudfyp99/dud+wvpMzGI+uXpq v90uNk2gwZp7OWuToK7d5h4zs171eshdnWZyBGmTtR7RjfZIWtNBVeOba8Bm+RNG rg+NiSjSQdIhro3PMFToSLqoPZMGavB7G3Wd5oRCbtHaVNOC4bLBNE9ShB8IzShX RWocmGcQIvvBO3rI27npmwQB0nwo1liLdxhsrL1dt0Px7WLPlZy4+Z12pVxQ/9VT F9M7RpsBcSIfGKxzwZuQRL8NeUMGxHJIk5z3WNCyEJpjy4N2xF/b4rxZETpgXGyy cUoAs4QBKvwA+g0OPhwQXVR8gkRUQ3dZWPbc30aRlZQyRONvKU7CQhENB6jlsyIS mq+W5NAdh6kOeB3oUkcwOlwDfdR2BsJBneklIwww68VcZhfTTT91ifDUUpyEXlVo 3aozV1zdBQFlWg7mdFW42SzgEUTD+yyRwtzXx/F8F+zhrG7pM9fDrF2oWfWptKsC Bnh+mqb8+wKpRUsFo44S7wNBNJS6LXWSEvvsZ4liUmo6GfSKKxintWiVRhQkv00T ucNrIatOeADR4nuXEiJMnBqTFxf4prfobK3+D/KYx/dhXGOR60/RYxdQ45KHoroD aCQcdq0/uaP+pI8V7Rtp =FBep -----END PGP SIGNATURE----- --Sig_/+_L+578aFh1LcEL6OaLqt2L--